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
..
C_obj	GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)	2014-02-10 14:00:14 +01:00
LevelLoader	GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)	2014-02-10 14:00:14 +01:00
C_Object.cpp	GL - merge with bullet physics and updated server	2014-02-10 14:41:43 +01:00
C_Object.h	GL - merge with bullet physics and updated server	2014-02-10 14:41:43 +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	Camera_Basic edits	2014-02-10 15:19:42 +01:00
Camera_Basic.h	Camera_Basic edits	2014-02-10 15:19:42 +01:00
Camera_FPS.cpp	Premerge	2014-02-10 16:30:47 +01:00
Camera_FPS.h	Added Camera_FPS	2014-02-10 15:19:55 +01:00
GameClientState.cpp	GL - started working with client application	2013-12-06 10:38:43 +01:00
GameClientState.h	asd	2014-01-31 14:14:20 +01:00
GameState.cpp	Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt	2014-02-10 17:00:45 +01:00
GameState.h	Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt	2014-02-10 17:00:45 +01:00
LanMenuState.cpp	GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)	2014-02-10 14:00:14 +01:00
LanMenuState.h	asd	2014-01-31 14:14:20 +01:00
LobbyState.cpp	GL - merge with bullet physics and updated server	2014-02-10 14:41:43 +01:00
LobbyState.h	GL - will merge with physics	2014-01-31 13:56:22 +01:00
LoginState.cpp	GL - merge with bullet physics and updated server	2014-02-10 14:41:43 +01:00
LoginState.h	GL - added loginstate	2014-01-30 11:58:44 +01:00