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
..
GameClientState	Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt	2014-02-10 17:00:45 +01:00
Include	GameServer - Merged with other half of GameLogic	2014-01-13 12:50:27 +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-merge-attempt	2014-02-10 17:00:45 +01:00
DanBiasGame.vcxproj.user	Added VS Filter Camera	2014-02-10 13:03:21 +01:00
DanBiasGame_Impl.cpp	GameServer - Multiplayer now working properly	2014-02-09 16:42:26 +01:00
GameClientRecieverFunc.h	GameServer - Multiplayer now working properly	2014-02-09 16:42:26 +01:00