Dander7BD 66d4fcef3a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer ... Conflicts: Code/Game/DanBiasGame/GameClientState/GameState.cpp Code/Game/DanBiasGame/GameClientState/LoginState.cpp		2014-02-14 11:44:49 +01:00
..
Buttons	Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer	2014-02-14 11:44:49 +01:00
C_obj	Bugs and Compilation errors dealt with	2014-02-12 14:33:56 +01:00
LevelLoader	GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content.	2014-02-13 16:33:26 +01:00
C_Object.cpp	GL - animated character and some textrendering	2014-02-11 15:00:52 +01:00
C_Object.h	Bugs and Compilation errors dealt with	2014-02-12 14:33:56 +01:00
Camera.cpp	Major overhaul	2014-02-09 21:24:09 +01:00
Camera.h	Broekn branch not broekn more	2014-01-29 10:18:01 +01:00
Camera_Basic.cpp	minor refractoring	2014-02-11 09:32:49 +01:00
Camera_Basic.h	Camera_Basic edits	2014-02-10 15:19:42 +01:00
Camera_FPS.cpp	Overhaul of GameState	2014-02-12 09:02:44 +01:00
Camera_FPS.h	Added Camera_FPS	2014-02-10 15:19:55 +01:00
GameClientState.cpp	stuff	2014-02-12 16:31:15 +01:00
GameClientState.h	Added LobbyAdminState + other stuff	2014-02-13 13:30:14 +01:00
GameState.cpp	GL - merge with graphics. no SSAO. no TextRendering	2014-02-14 11:27:52 +01:00
GameState.h	premerge	2014-02-13 15:21:02 +01:00
LanMenuState.cpp	bug fixes	2014-02-14 11:37:20 +01:00
LanMenuState.h	Overhaul LanMenuState	2014-02-13 10:14:44 +01:00
LobbyAdminState.cpp	MousePos available in all relevant states	2014-02-14 11:32:16 +01:00
LobbyAdminState.h	Added LobbyAdminState + other stuff	2014-02-13 13:30:14 +01:00
LobbyState.cpp	MousePos available in all relevant states	2014-02-14 11:32:16 +01:00
LobbyState.h	Added LobbyAdminState + other stuff	2014-02-13 13:30:14 +01:00
MainState.cpp	Revert "Revert this"	2014-02-14 11:27:23 +01:00
MainState.h	stuff	2014-02-12 16:31:15 +01:00