NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/GamePhysics
History
Dander7BD 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame.vcxproj
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
	Code/Game/DanBiasGame/GameClientState/LobbyState.h
	Code/Game/DanBiasGame/GameClientState/LoginState.h
	Code/Game/DanBiasGame/GameClientState/MainState.cpp
	Code/Game/GameProtocols/ObjectProtocols.h
	Code/Game/GameServer/Implementation/GameSession_General.cpp
 		2014-02-12 13:23:50 +01:00
..
Implementation Fixed collision for object not in world 2014-02-12 12:38:52 +01:00
GamePhysics.vcxproj Fixed incorrect settings for vld in some projects 2014-02-12 13:14:28 +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