Dander7BD 45f6d983ad Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge ... Conflicts: Code/Game/DanBiasGame/DanBiasGame_Impl.cpp Code/Game/DanBiasGame/GameClientState/GameState.cpp Code/Game/DanBiasGame/GameClientState/LoginState.cpp		2014-02-13 08:48:34 +01:00
..
Buttons	Misc - Changed to MouseInput struct in EventHandler update.	2014-02-12 15:44:27 +01:00
C_obj	GL - moving character	2014-02-12 11:35:34 +01:00
LevelLoader	Försök till merge men det är cp	2014-02-12 14:48:58 +01:00
C_Object.cpp	GL - animated character and some textrendering	2014-02-11 15:00:52 +01:00
C_Object.h	Compiler fixes in State classes	2014-02-12 10:43:06 +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	Compiler fixes in State classes	2014-02-12 10:43:06 +01:00
GameClientState.h	GL - moving character	2014-02-12 11:35:34 +01:00
GameState.cpp	Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic	2014-02-12 15:03:40 +01:00
GameState.h	GL - forgot to commit files	2014-02-12 11:36:08 +01:00
LanMenuState.cpp	Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge	2014-02-12 13:23:50 +01:00
LanMenuState.h	Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge	2014-02-12 13:23:50 +01:00
LobbyState.cpp	Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge	2014-02-12 13:23:50 +01:00
LobbyState.h	Compiler fixes in State classes	2014-02-12 10:43:06 +01:00
MainState.cpp	Compiler fixes in State classes	2014-02-12 10:43:06 +01:00
MainState.h	Compiler fixes in State classes	2014-02-12 10:43:06 +01:00