NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/DanBiasGame
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
..
GameClientState Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
Include DanBiasGame_Impl overhauled 2014-02-12 11:19:25 +01:00
DLLMain.cpp GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions 2014-01-13 12:44:33 +01:00
DanBiasGame.vcxproj Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
DanBiasGame.vcxproj.user Added VS Filter Camera 2014-02-10 13:03:21 +01:00
DanBiasGame_Impl.cpp DanBiasGame_Impl overhauled 2014-02-12 11:19:25 +01:00
GameClientRecieverFunc.h Compiler fixes in State classes 2014-02-12 10:43:06 +01:00