Commit Graph

675 Commits

Author SHA1 Message Date
Dander7BD a8c87273e2 Gravity normal fix
Forgot to update that value. Done
2014-01-20 11:29:42 +01:00
Dander7BD 80c835be58 BoxVsBox pointOfContact fix
it was not translated
2014-01-20 11:29:42 +01:00
Dander7BD ff4a39cdac Gravity implemented 2014-01-20 11:29:41 +01:00
Dander7BD 337c92a5b8 Added Equal operators to Gravity struct
== & !=
2014-01-20 11:29:40 +01:00
Dander7BD 0f3c92cd52 Obsolete code removed
More commentated out than deleted actually
2014-01-20 11:29:39 +01:00
Robin Engman acb344ca44 Added missing mass and inertia 2014-01-20 11:29:39 +01:00
Dander7BD 2dfe312e04 AngularVelocity fix 2014-01-20 11:29:38 +01:00
Dander7BD a41d53b911 Revert "Inertia tensor fix"
This reverts commit 23dab9dea6.
2014-01-20 11:29:37 +01:00
Dander7BD 461d153036 Inertia tensor fix
should produce radian anglevelocities
2014-01-20 11:29:37 +01:00
Dander7BD 34dc27655b Tangiential formula fixes 2014-01-20 11:29:36 +01:00
Dander7BD f2c6cc5306 Revert "Work asssignment split line"
This reverts commit 8ecd263318.
2014-01-20 11:29:35 +01:00
Dander7BD 2314935f48 linear coll. resp. fix add
fix didn't cover all cases. Now it do
2014-01-20 11:29:35 +01:00
Dander7BD ee5e5ff8ce linear collision response fix
moved improved version of Robin's implementation
2014-01-20 11:29:34 +01:00
Dander7BD 727b2acb82 angular collision response fix
Incorrect formula found and corrected
2014-01-20 11:29:33 +01:00
Dander7BD 502513d4f8 Work asssignment split line 2014-01-20 11:29:33 +01:00
Dander7BD 7834264e5f Physics proj .. show all files should be set to false
That is how we in Physics rolls
2014-01-20 11:29:32 +01:00
Erik Persson ce4c57bab3 GL - player inherits dynamicobject instead of object 2014-01-20 08:40:41 +01:00
Dennis Andersen b85439bd5e Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-18 18:01:23 +01:00
Dander7BD f660a5c64e Added ICustombody event subscription
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.

External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-17 16:07:25 +01:00
Dander7BD 7c448792dd Gravity normal fix
Forgot to update that value. Done
2014-01-17 13:30:07 +01:00
lanariel 893934dcf4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/Tester/MainTest.cpp
2014-01-17 09:07:42 +01:00
lanariel ab0b9a925a /Graphics Fixed stable pipeline with no warnings 2014-01-17 09:05:18 +01:00
lanariel faa6efba57 added .cso to git ignore 2014-01-17 09:04:13 +01:00
bladdidoo 61b8baed1b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
	Code/Tester/MainTest.cpp
2014-01-17 08:58:49 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
bladdidoo c48f640cdf Loading .Dan geometry and material 2014-01-17 08:51:12 +01:00
lindaandersson 7b2be02113 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-16 12:26:33 +01:00
lindaandersson a168328a44 GL - movement with physics working!! 2014-01-16 12:26:14 +01:00
Erik Persson d08e999f07 Create level and initiate it with a rigidbody etc 2014-01-16 12:08:24 +01:00
Erik Persson df7801336a Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 11:40:58 +01:00
Erik Persson 225d8912da GL - make rigidbody level 2014-01-16 11:40:29 +01:00
Dander7BD 36a8372072 Merge branch 'Gravity' into Physics 2014-01-16 11:36:31 +01:00
Dander7BD 2e32ac02fa Merge remote-tracking branch 'origin/CollisionResponse' into Physics 2014-01-16 11:36:18 +01:00
Dander7BD 27b6affd6a BoxVsBox pointOfContact fix
it was not translated
2014-01-16 11:28:07 +01:00
Erik Persson 0080a9f6f2 small name changes 2014-01-16 11:17:19 +01:00
Erik Persson 8f3befecf4 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 11:16:26 +01:00
Erik Persson 567fa229eb small name changes 2014-01-16 11:07:45 +01:00
lindaandersson a070e4d459 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 09:30:30 +01:00
lindaandersson aac92bc20e GL- send new player pos to client 2014-01-16 09:30:16 +01:00
lanariel 483236801f Fixed compile warnings and crash on non existing models 2014-01-16 09:30:01 +01:00
lindaandersson 0c8783ba84 GL - merge done 2014-01-15 12:02:52 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
Dennis Andersen 5f00aa7af7 GL - Merge with origin/Gamelogic 2014-01-15 11:45:34 +01:00
Erik Persson 208482b0ce GL merge error 2014-01-15 11:25:59 +01:00
Dennis Andersen ceac5ce31d Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic 2014-01-15 11:03:25 +01:00
Dander7BD 44e071fba9 Gravity implemented 2014-01-15 10:44:31 +01:00
Dander7BD 7a48e058da Added Equal operators to Gravity struct
== & !=
2014-01-15 10:44:20 +01:00
Dander7BD e9ad87507f Obsolete code removed
More commentated out than deleted actually
2014-01-15 09:06:57 +01:00
lindaandersson 9a32c44e49 GL - Merge branch 'GameLogic' 2014-01-15 08:19:35 +01:00
lindaandersson 0ffe26c134 GL - Merge client with gameserver 2014-01-15 08:18:06 +01:00