NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/GameServer
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 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
GameClient.h GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
GameLobby.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
GameServer.vcxproj Fixed incorrect settings for vld in some projects 2014-02-12 13:14:28 +01:00
GameServer.vcxproj.user Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
GameServerAPI.h GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
GameSession.h GameServer - Added more gameplay protocols and structured the old mess 2014-02-11 10:21:47 +01:00