Commit Graph

  • 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... Dennis Andersen 2014-01-29 15:01:14 +0100
  • 88e67ff876 Inertia big patch Dander7BD 2014-01-29 14:57:39 +0100
  • 446bdd412b GL - updated constructors to set before and after collision response functions lindaandersson 2014-01-29 14:33:21 +0100
  • 3a9c47722a Merge remote-tracking branch 'origin/Physics' into GameLogic lindaandersson 2014-01-29 13:18:25 +0100
  • 16334ea2db GL - collision working, going to merge with physics lindaandersson 2014-01-29 13:18:17 +0100
  • aa99742894 Added epsilon value for testing Robin Engman 2014-01-29 12:22:18 +0100
  • 1d3b073e7f Added functionallity to stop collision responses Robin Engman 2014-01-29 11:22:04 +0100
  • 4ccf11b5d6 Fixed vector issue Robin Engman 2014-01-29 10:54:59 +0100
  • 36f057d2cc Broekn branch not broekn more Dennis Andersen 2014-01-29 10:18:01 +0100
  • 60062feb07 Documentation update Dander7BD 2014-01-28 17:51:02 +0100
  • f968adebeb GL - LevelLoader = done and done Sam Mario Svensson 2014-01-28 16:15:10 +0100
  • 3b552d5361 GL - change gamelogic to use the new physics lindaandersson 2014-01-28 15:44:32 +0100
  • 9ccfebd9fd GL - merge with physics lindaandersson 2014-01-28 15:43:32 +0100
  • a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. lindaandersson 2014-01-28 15:04:25 +0100
  • 99a605a25b Iterpolated Animations lanariel 2014-01-28 13:48:15 +0100
  • 42addb9c06 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics Robin Engman 2014-01-28 13:39:28 +0100
  • 15ae3675b4 Updated UML with functions Robin Engman 2014-01-28 13:39:15 +0100
  • 78706f9929 Revert "Formula fix" Dander7BD 2014-01-28 11:43:24 +0100
  • 8435a2c970 Formula fix Dander7BD 2014-01-28 11:31:11 +0100
  • 2b63563a9b Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat Sam Mario Svensson 2014-01-28 11:30:59 +0100
  • d2ebad7445 GL - Fixed ParseFunction so now we only have 1 + specialcases functions instead of 1 function for every case Sam Mario Svensson 2014-01-28 11:29:35 +0100
  • 4de1c1aafd GL - More Object structs, LevelLoader api comments. Pontus Fransson 2014-01-28 11:27:29 +0100
  • eb27a4edfb Added ExtractForward to frustum. Robin Engman 2014-01-28 10:38:58 +0100
  • 6148783fe4 Added args to ApplyEffect Robin Engman 2014-01-28 10:18:26 +0100
  • f96c5a9f7e Changed float4 to float3 Robin Engman 2014-01-28 09:52:58 +0100
  • 018d6e3c5a Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics Robin Engman 2014-01-28 09:25:07 +0100
  • 5d1e05cc4e Added new function to set orientation. Robin Engman 2014-01-28 09:24:51 +0100
  • 6be72da03a OysterPhysics3D updated Dander7BD 2014-01-28 09:23:58 +0100
  • a07e2911de Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics Robin Engman 2014-01-28 09:01:50 +0100
  • 5bf92757a5 State struct fixed since last inactivation. Robin Engman 2014-01-28 09:01:35 +0100
  • 201095eb41 Merge remote-tracking branch 'origin/Moment-of-Inertia' into Physics Dander7BD 2014-01-28 09:00:47 +0100
  • 91e825dbfb Broekn stuff to tobias Dennis Andersen 2014-01-28 09:00:02 +0100
  • 4d6cfaf046 ... part 3 -_- Dander7BD 2014-01-28 08:57:14 +0100
  • 4e4aaf881a Inactivated code part 2 Dander7BD 2014-01-28 08:56:29 +0100
  • cbdce81b20 Inactivated code Dander7BD 2014-01-28 08:54:20 +0100
  • 9cf82dd3b1 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics lanariel 2014-01-27 15:38:09 +0100
  • 87793b3926 Added documentation Dander7BD 2014-01-27 15:04:48 +0100
  • dd2b214122 GL- la in memcpy för parsing i parseFunctions Sam Mario Svensson 2014-01-27 14:57:18 +0100
  • e11dc6551c GL - ? Erik Persson 2014-01-27 14:45:10 +0100
  • a8dbf2a4c9 GL - added test box to level lindaandersson 2014-01-27 14:43:39 +0100
  • 15625ac5d2 Basic Animation (NOT STABLE) lanariel 2014-01-27 14:24:13 +0100
  • 3896514bae GL - mergecommit lindaandersson 2014-01-27 14:02:37 +0100
  • 99fbef8a64 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat Sam Mario Svensson 2014-01-27 13:57:42 +0100
  • 91bf6ce901 GL- LevelFormat fix Sam Mario Svensson 2014-01-27 13:57:18 +0100
  • 4085a5f5e2 GL - added shot protocol lindaandersson 2014-01-27 13:56:31 +0100
  • 1ed1bab751 Created test box that should now be shot at by the player Erik Persson 2014-01-27 13:54:57 +0100
  • 51a1b3ecff GL - Resource get size Pontus Fransson 2014-01-27 13:54:56 +0100
  • 5b984db9ba GL - gameState merge lindaandersson 2014-01-27 13:25:09 +0100
  • d6432b2c73 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat Sam Mario Svensson 2014-01-27 10:16:25 +0100
  • 1748fe323a GL - Added Parsing functions for levelLoader and moved Packing classes to misc Sam Mario Svensson 2014-01-27 10:15:39 +0100
  • e188794aa3 GL - Load level in LevelParser Pontus Fransson 2014-01-27 10:14:02 +0100
  • 74ac5e2d31 Updated creation of objects Erik Persson 2014-01-27 08:54:25 +0100
  • 30054a8c23 Slerp compile fix Dander7BD 2014-01-24 17:48:49 +0100
  • b4eb3eb25d Slerp Dander7BD 2014-01-24 17:39:09 +0100
  • 2da3dd29fc InterpolateOrientation_UsingNonRigidNlerp Dander7BD 2014-01-24 16:32:54 +0100
  • 8f63bf637e Physics UMLET diagram Dander7BD 2014-01-24 15:03:03 +0100
  • 3c1d66e3f8 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat Sam Mario Svensson 2014-01-24 10:42:19 +0100
  • c84ed645f0 GameLogic - implementation of LevelLoader Sam Mario Svensson 2014-01-24 10:22:18 +0100
  • aaf3bf30f9 GL - LevelParser half way implemented. Pontus Fransson 2014-01-24 10:01:58 +0100
  • 0f5517398d GL - Update uml, LevelParser.h.cpp ObjectDefines.h Pontus Fransson 2014-01-24 09:00:59 +0100
  • ff936133fc Physics engine now using struct MomentOfInertia Dander7BD 2014-01-23 19:13:02 +0100
  • c3ed5e78ac struct ::Oyster::Physics3D::MomentOfInertia Dander7BD 2014-01-23 18:45:33 +0100
  • ee5392c60d Vector::PiecewiseMultiplicationAdd Dander7BD 2014-01-23 18:34:48 +0100
  • 163481ce4f Documentation edit Dander7BD 2014-01-23 18:33:48 +0100
  • ff1fbdffa1 Vector::PiecewiseMultiplication Dander7BD 2014-01-23 17:13:50 +0100
  • 76e4b23f19 Added documentation Dander7BD 2014-01-23 14:54:53 +0100
  • fb2cf714c6 GL - sending dir to server, forward and backward walking works lindaandersson 2014-01-23 14:28:53 +0100
  • 07e5519850 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-23 09:25:02 +0100
  • 8c297d1e9b GL - starting to send lookdir to server lindaandersson 2014-01-23 09:24:55 +0100
  • bd739f8acb GL - Creation of objects kinda sorted Erik Persson 2014-01-23 09:14:04 +0100
  • 121fd51c45 GL collision with level should worm Erik Persson 2014-01-23 08:57:46 +0100
  • 3f144289ec GL - merge with gameserver, crash on collision in gameLogic lindaandersson 2014-01-23 08:30:26 +0100
  • a591903d8f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-23 08:25:10 +0100
  • f657a58a4f GL - adding a camera on the client lindaandersson 2014-01-23 08:24:35 +0100
  • 6b1dd34a72 Working SSAO + Read Animated .dan lanariel 2014-01-22 16:31:33 +0100
  • 6a888cb154 GL - adjusting collisionManager Erik Persson 2014-01-22 15:47:44 +0100
  • 9c18ba14b9 Fixed kinetic calculation Robin Engman 2014-01-22 15:29:50 +0100
  • 22a5db97f8 Added final protocols, and a bit of support for them on server side Dennis Andersen 2014-01-22 15:22:52 +0100
  • 467cf1eb68 Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-01-22 14:41:53 +0100
  • ce80e8155c GL - formatting mistake Erik Persson 2014-01-22 14:39:10 +0100
  • 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager Erik Persson 2014-01-22 14:26:45 +0100
  • bcbe67b620 Made default value of onCollisionResponse null Robin Engman 2014-01-22 14:09:53 +0100
  • 53961f0e88 Added new onCollisionResponse handle Robin Engman 2014-01-22 13:50:54 +0100
  • 80204ecbe3 GL - Massdriver usage of applyeffect Erik Persson 2014-01-22 13:02:13 +0100
  • 0cae6261e9 ApplyEffect is now easier to handle for the user Robin Engman 2014-01-22 12:36:12 +0100
  • 0443e753e8 GameLogic, Uml for levelLoader updated Sam Mario Svensson 2014-01-22 11:31:56 +0100
  • c178ec34fd Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2014-01-22 10:51:24 +0100
  • db593f65a2 Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-01-22 10:51:13 +0100
  • 1b86500ab0 GameLogic - Uml for LevelLoader Sam Mario Svensson 2014-01-22 10:39:16 +0100
  • 954de26b43 GL - mergeproblems Erik Persson 2014-01-21 16:11:02 +0100
  • 0aae9de92b blah Erik Persson 2014-01-21 16:08:55 +0100
  • ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver Erik Persson 2014-01-21 15:46:54 +0100
  • 6cf5ed3a22 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-21 14:58:08 +0100
  • 5c85580ffd Added gravity normal to state struct Robin Engman 2014-01-21 14:56:34 +0100
  • 8792aab992 GL - merge with gameServer lindaandersson 2014-01-21 14:36:46 +0100
  • 50c09547f3 GameServer - Added protocols and stuff Dennis Andersen 2014-01-21 14:32:42 +0100
  • 561418c427 GL - gravity working lindaandersson 2014-01-21 14:28:27 +0100
  • 39e4f7881b Added typedef for collision response Robin Engman 2014-01-21 14:24:45 +0100
  • b0227ab513 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics Robin Engman 2014-01-21 14:11:17 +0100
  • 090d44b518 Added visit function to API Robin Engman 2014-01-21 14:10:31 +0100