Dander7BD f53926444f Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt ... Conflicts: Code/Game/DanBiasGame/GameClientState/GameState.cpp Code/Game/DanBiasGame/GameClientState/GameState.h		2014-02-10 17:00:45 +01:00
..
Implementation	Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..	2014-02-09 18:58:07 +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	Premerge	2014-02-10 16:30:47 +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 - Multiplayer now working properly	2014-02-09 16:42:26 +01:00