Danbias/Code/Game
Dander7BD 96cb865242 Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
	Code/Game/GameLogic/GameAPI.h
	Code/Game/GameLogic/Player.cpp
	Code/Game/GameLogic/Player.h
	Code/Game/GameServer/GameSession.h
	Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h
2014-02-27 11:18:16 +01:00
..
GameClient Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 2014-02-27 11:18:16 +01:00
GameLauncher Major cleanup 2014-02-17 10:38:11 +01:00
GameLogic Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 2014-02-27 11:18:16 +01:00
GameProtocols GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 10:32:08 +01:00
GameServer Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 2014-02-27 11:18:16 +01:00
LanServer GL - fixing with explosivecrate and massdriver 2014-02-21 15:02:42 +01:00
LevelLoader Health pickups is now working! 2014-02-27 10:27:54 +01:00