NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/GameClient/GameClientState
History
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 		2014-02-19 11:25:33 +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
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 Camera swap 2014-02-18 17:42:00 +01:00
Camera_FPSV2.h Camera swap 2014-02-18 17:42:00 +01:00
GameClientState.cpp GameClientState Patch 2014-02-18 17:28:24 +01:00
GameClientState.h GameClientState Patch 2014-02-18 17:28:24 +01:00
GameState.cpp Linda fixing some lvl loading stuff 2014-02-19 10:55:59 +01:00
GameState.h GameClientState Patch 2014-02-18 17:28:24 +01:00
LanMenuState.cpp Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:25:33 +01:00
LanMenuState.h GameClientState Patch 2014-02-18 17:28:24 +01:00
LobbyAdminState.cpp GameClientState Patch 2014-02-18 17:28:24 +01:00
LobbyAdminState.h GameClientState Patch 2014-02-18 17:28:24 +01:00
LobbyState.cpp GameClientState Patch 2014-02-18 17:28:24 +01:00
LobbyState.h GameClientState Patch 2014-02-18 17:28:24 +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 branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:25:33 +01:00
NetLoadState.h GameClientState Patch 2014-02-18 17:28:24 +01:00
SharedStateContent.h Bunch of implementations 2014-02-17 14:33:23 +01:00