Danbias/Code/Game/DanBiasGame
Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-14 15:38:01 +01:00
..
GameClientState Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-14 15:38:01 +01:00
Include stuff 2014-02-12 17:20:42 +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 Tweaks and a new state: NetLoadState 2014-02-14 14:31:01 +01:00
DanBiasGame.vcxproj.user some fixes 2014-02-13 09:45:45 +01:00
DanBiasGame_Impl.cpp Tweaks and a new state: NetLoadState 2014-02-14 14:31:01 +01:00
GameClientRecieverFunc.h Compiler fixes in State classes 2014-02-12 10:43:06 +01:00