Dander7BD b78625c230 Merge remote-tracking branch 'origin/GameServer' into GameClient ... Conflicts: Code/Game/GameClient/GameClientState/NetLoadState.cpp		2014-02-18 13:10:17 +01:00
..
Buttons	Added Gui Transparancy,	2014-02-18 09:32:10 +01:00
C_obj	Major cleanup	2014-02-17 10:38:11 +01:00
LevelLoader	Major cleanup	2014-02-17 10:38:11 +01:00
C_Object.cpp	Patch	2014-02-17 11:27:43 +01:00
C_Object.h	Patch	2014-02-17 11:27:43 +01:00
Camera.cpp	Major cleanup	2014-02-17 10:38:11 +01:00
Camera.h	Major cleanup	2014-02-17 10:38:11 +01:00
Camera_Basic.cpp	Major cleanup	2014-02-17 10:38:11 +01:00
Camera_Basic.h	Major cleanup	2014-02-17 10:38:11 +01:00
Camera_BasicV2.cpp	New Cameras	2014-02-18 12:04:22 +01:00
Camera_BasicV2.h	New Cameras	2014-02-18 12:04:22 +01:00
Camera_FPS.cpp	Removed some debug lines	2014-02-18 11:12:47 +01:00
Camera_FPS.h	Major cleanup	2014-02-17 10:38:11 +01:00
Camera_FPSV2.cpp	New Cameras	2014-02-18 12:04:22 +01:00
Camera_FPSV2.h	New Cameras	2014-02-18 12:04:22 +01:00
GameClientState.cpp	Patch	2014-02-17 11:27:43 +01:00
GameClientState.h	Patch	2014-02-17 11:27:43 +01:00
GameState.cpp	removed debug lines	2014-02-18 12:59:51 +01:00
GameState.h	Oops .. Forgot to save this one for the previous commit	2014-02-17 16:18:21 +01:00
LanMenuState.cpp	Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient	2014-02-18 09:33:44 +01:00
LanMenuState.h	Patch	2014-02-17 11:27:43 +01:00
LobbyAdminState.cpp	Added Gui Transparancy,	2014-02-18 09:32:10 +01:00
LobbyAdminState.h	Patch	2014-02-17 11:27:43 +01:00
LobbyState.cpp	Added Gui Transparancy,	2014-02-18 09:32:10 +01:00
LobbyState.h	Patch	2014-02-17 11:27:43 +01:00
MainState.cpp	Added Gui Transparancy,	2014-02-18 09:32:10 +01:00
MainState.h	Patch	2014-02-17 11:27:43 +01:00
NetLoadState.cpp	Merge remote-tracking branch 'origin/GameServer' into GameClient	2014-02-18 13:10:17 +01:00
NetLoadState.h	Patch	2014-02-17 11:27:43 +01:00
SharedStateContent.h	Bunch of implementations	2014-02-17 14:33:23 +01:00