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

651 Commits

Author SHA1 Message Date
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
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
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
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 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
Dander7BD 0b8ecd740a 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-20 11:29:43 +01:00
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