Commit Graph

8 Commits

Author SHA1 Message Date
Erik Persson c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic
Conflicts:
	Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
Robin Engman c740bd5935 Added some data to PhysicsAPI
GetRigidLinearVelocity() and void* as reference to game object.
2013-12-12 10:02:35 +01:00
Erik Persson 2424b51c3e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
	Bin/Content/Shaders/DebugVertex.cso
2013-12-12 09:39:27 +01:00
Erik Persson e11d7d94f7 updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
dean11 64a8089e54 GameLogic - Worked on server 2013-12-04 11:37:26 +01:00
lanariel ce294cd1d7 Forgot to add a folder 2013-12-04 09:43:43 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00