Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer ... Conflicts: Code/Game/DanBiasGame/GameClientState/C_Object.h Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h Code/Game/DanBiasGame/GameClientState/GameState.cpp		2014-02-14 15:38:01 +01:00
..
DanBiasGame	Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer	2014-02-14 15:38:01 +01:00
DanBiasLauncher	Added LobbyAdminState + other stuff	2014-02-13 13:30:14 +01:00
DanBiasServer/GameSession	GL - merge	2014-01-30 12:01:48 +01:00
DanBiasServerLauncher	Fix start render	2014-02-12 15:02:29 +01:00
GameLogic	GL- levelLoader can now load a correct spawnpoint	2014-02-14 15:19:07 +01:00
GameProtocols	Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge	2014-02-12 13:23:50 +01:00
GameServer	Added LobbyAdminState + other stuff	2014-02-13 13:30:14 +01:00
aDanBiasGameLauncher	Fix start render	2014-02-12 15:02:29 +01:00