Dander7BD 45f6d983ad Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge ... Conflicts: Code/Game/DanBiasGame/DanBiasGame_Impl.cpp Code/Game/DanBiasGame/GameClientState/GameState.cpp Code/Game/DanBiasGame/GameClientState/LoginState.cpp		2014-02-13 08:48:34 +01:00
..
Implementation	Fixed set position	2014-02-12 14:10:17 +01:00
GamePhysics.vcxproj	Merge remote-tracking branch 'origin/GamePhysics' into Camera-test-merge	2014-02-12 13:30:03 +01:00
GamePhysics.vcxproj.filters	Stuff	2013-12-20 11:59:35 +01:00
GamePhysics.vcxproj.user	post merge + minor edits	2014-01-09 11:36:55 +01:00
PhysicsAPI.h	Added apply effect functionality	2014-02-12 10:23:17 +01:00
PhysicsFormula-Impl.h	Friction fix	2014-02-04 08:55:57 +01:00
PhysicsFormula.h	Renamed Formula::CollisionResponse::Impulse to..	2013-12-20 12:08:20 +01:00
PhysicsStructs-Impl.h	Amazing merge with server	2014-02-10 12:42:31 +01:00
PhysicsStructs.h	Fixed state problem	2014-02-10 15:46:55 +01:00