NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/GameServer
History
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
..
Implementation Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 2014-02-27 11:18:16 +01:00
GameClient.h GameLogic - Added disconnect messages and reuse of players 2014-02-20 16:52:36 +01:00
GameLobby.h Connection between server and client is stable 2014-02-18 16:38:08 +01:00
GameServer.vcxproj GameServer - Painly merge with GameLogic 2014-02-19 22:44:31 +01:00
GameServer.vcxproj.user GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:27 +01:00
GameServerAPI.h Fixed server-client communication 2014-02-18 13:12:08 +01:00
GameSession.h Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 2014-02-27 11:18:16 +01:00