Dander7BD 805f90d926 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer ... Conflicts: Code/Game/DanBiasGame/GameClientState/LoginState.cpp		2014-02-13 15:25:07 +01:00
..
CustomNetProtocol.cpp	GameServer - Merged with GameLogic	2014-02-05 15:16:31 +01:00
CustomNetProtocol.h	stuff	2014-02-12 17:20:42 +01:00
NetworkAPI.vcxproj	Broekn branch not broekn more	2014-01-29 10:18:01 +01:00
NetworkAPI.vcxproj.user	Master - Modified igore	2014-01-08 13:07:55 +01:00
NetworkAPI_Preprocessor.h	Broekn stuff to tobias	2014-01-28 09:00:02 +01:00
NetworkClient.cpp	Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer	2014-02-13 15:25:07 +01:00
NetworkClient.h	Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer	2014-02-13 15:25:07 +01:00
NetworkServer.cpp	GameServer - Fixed bugg where threads touched same data, n players should now be able to connect	2014-02-04 16:07:10 +01:00
NetworkServer.h	GameServer - Merge with GameLogic	2014-02-04 22:13:07 +01:00
NetworkServerEventStruct.h	Broekn stuff to tobias	2014-01-28 09:00:02 +01:00
NetworkSession.cpp	GameServer - Fixed bugg where threads touched same data, n players should now be able to connect	2014-02-04 16:07:10 +01:00
NetworkSession.h	GameLogic - Merged with GL	2014-01-31 09:24:16 +01:00
Translator.cpp	stuff	2014-02-12 17:20:42 +01:00
Translator.h	Broekn stuff to tobias	2014-01-28 09:00:02 +01:00