Danbias/Code/Game/GameProtocols
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
..
GameProtocols.vcxproj GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
GameProtocols.vcxproj.user Master - Modified igore 2014-01-08 13:07:55 +01:00
GeneralProtocols.h GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
LobbyProtocols.h GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
ObjectProtocols.h GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
PlayerProtocols.h GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
ProtocolIdentificationID.h Overhaul of GameState 2014-02-12 09:02:44 +01:00
Protocols.h Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00