NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
676 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

605 Commits

Author SHA1 Message Date
Erik Persson 467cf1eb68 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-22 14:41:53 +01:00
Erik Persson ce80e8155c GL - formatting mistake 2014-01-22 14:39:10 +01:00
Erik Persson 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager 2014-01-22 14:26:45 +01:00
Robin Engman bcbe67b620 Made default value of onCollisionResponse null 2014-01-22 14:09:53 +01:00
Robin Engman 53961f0e88 Added new onCollisionResponse handle 2014-01-22 13:50:54 +01:00
Erik Persson 80204ecbe3 GL - Massdriver usage of applyeffect 2014-01-22 13:02:13 +01:00
Robin Engman 0cae6261e9 ApplyEffect is now easier to handle for the user 
Only needs a function with a pointer to an ICustomBody now.
 2014-01-22 12:36:12 +01:00
Sam Mario Svensson 0443e753e8 GameLogic, Uml for levelLoader updated 2014-01-22 11:32:11 +01:00
Erik Persson c178ec34fd Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-22 10:51:24 +01:00
Erik Persson db593f65a2 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-22 10:51:13 +01:00
Sam Mario Svensson 1b86500ab0 GameLogic - Uml for LevelLoader 2014-01-22 10:39:16 +01:00
Erik Persson 954de26b43 GL - mergeproblems 2014-01-21 16:11:02 +01:00
Erik Persson 0aae9de92b blah 2014-01-21 16:10:07 +01:00
Erik Persson ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver 2014-01-21 16:09:39 +01:00
Robin Engman 5c85580ffd Added gravity normal to state struct 2014-01-21 14:56:34 +01:00
lindaandersson 8792aab992 GL - merge with gameServer 2014-01-21 14:36:46 +01:00
Dennis Andersen 50c09547f3 GameServer - Added protocols and stuff 2014-01-21 14:32:42 +01:00
lindaandersson 561418c427 GL - gravity working 2014-01-21 14:28:27 +01:00
Robin Engman 39e4f7881b Added typedef for collision response 2014-01-21 14:24:45 +01:00
Robin Engman b0227ab513 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2014-01-21 14:11:17 +01:00
Robin Engman 090d44b518 Added visit function to API 
Called with collideable and hit action
 2014-01-21 14:10:31 +01:00
Dander7BD 65db1bf90d lerp fix 3 2014-01-21 12:11:30 +01:00
Dander7BD 0d39240fc2 lerp fix 2 2014-01-21 12:08:31 +01:00
Dander7BD b422d2d509 lerp fix 2014-01-21 12:01:12 +01:00
Robin Engman 94f1c20817 Added more data to rigid body description. 
Friction and restitution coeffs
 2014-01-21 11:48:04 +01:00
Dander7BD ea647c185c Merge branch 'LERP' into Physics 2014-01-21 11:23:32 +01:00
Dander7BD 9a2d2b9490 Interpolation methods referred in ::Oyster::Math & Math3D 2014-01-21 11:23:03 +01:00
Dander7BD 408d51e46b SnapAxisYToNormal_UsingNlerp implemented 2014-01-21 11:15:33 +01:00
lindaandersson c7b3c1ec30 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-21 10:38:03 +01:00
lindaandersson 06d468299a GL - linking problem fix 2014-01-21 10:37:45 +01:00
Dander7BD 43e5561995 Gravity fix 3 2014-01-21 10:34:22 +01:00
Dander7BD 7087421bb9 InterpolateAxisYToAxis_Nlerp implemented 2014-01-21 10:32:44 +01:00
lindaandersson a1d98b9357 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-21 10:05:03 +01:00
lindaandersson 44929f005d Merge remote-tracking branch 'origin/GameServer' into GameLogic 2014-01-21 10:03:51 +01:00
Dander7BD 76723cf2d8 Gravity fix 2 2014-01-21 09:58:33 +01:00
Dennis Andersen f7f59e8ac8 GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client 2014-01-21 09:52:48 +01:00
Dander7BD 98563b6c33 Gravity fix 2014-01-21 09:27:52 +01:00
Dander7BD 748023bf9e Vector Nlerp fix 2014-01-21 08:57:18 +01:00
Dander7BD 2ec8662a83 Utility::Value::Clamp 2014-01-20 18:46:08 +01:00
Dander7BD 28fbcebf98 general lerp & vector nlerp 2014-01-20 18:45:34 +01:00
Dander7BD 24a6e7478e Merge remote-tracking branch 'origin/Physics' into Sprint3 2014-01-20 17:08:52 +01:00
Dennis Andersen 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
Dennis Andersen 386b27e2f7 GameLogic - Merge with sprint2.5 2014-01-20 16:17:01 +01:00
Dennis Andersen 7cdfa726ea GameLogic - Merged with Sprint2.5, fixed physics errors 2014-01-20 16:09:58 +01:00
Dennis Andersen 1a3c63cda9 GameLogic - fixed some minor merging errors 2014-01-20 16:02:26 +01:00
Dennis Andersen ab2a3a3892 GameLogic - fixed some minor merging errors 2014-01-20 16:01:54 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
Dander7BD 0107745c7e Disable rotation 
disabled at:
* RigidBody::Update_LeapFrog
* SimpleRigidBody::SetState
* SphericalRigidBody::SetState
 2014-01-20 15:31:19 +01:00
Dander7BD 82d1a03450 ICustomBody :: Custom Tag added 2014-01-20 13:44:12 +01:00
lindaandersson a1128986d5 Merge with Gamle Logic 2014-01-20 11:59:43 +01:00