NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/DanBiasGame/GameClientState
History
Dander7BD 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame.vcxproj
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
	Code/Game/DanBiasGame/GameClientState/LobbyState.h
	Code/Game/DanBiasGame/GameClientState/LoginState.h
	Code/Game/DanBiasGame/GameClientState/MainState.cpp
	Code/Game/GameProtocols/ObjectProtocols.h
	Code/Game/GameServer/Implementation/GameSession_General.cpp
 		2014-02-12 13:23:50 +01:00
..
Buttons GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. 2014-02-12 11:35:57 +01:00
C_obj GL - moving character 2014-02-12 11:35:34 +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 - 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 GL - moved camera for testing 2014-02-12 13:17:27 +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