BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into AndersTestNetwork

Browse Source 
# Conflicts:
#	include/Game/Systems/DamageIndicatorSystem.h
#	src/Game/Systems/DamageIndicatorSystem.cpp
#	src/Game/Systems/SoundSystem.cpp
This commit is contained in:
verysecrethero
2016-02-25 10:30:35 +01:00
parent cca237b33f da1c7b3093
commit bc227c3d61
48 changed files with 916 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/HybridClient.h
-13
View File
@@ -1,13 +0,0 @@
#ifndef HybridClient_h__
#define HybridClient_h__
class HybridClient
{
public:
HybridClient();
~HybridClient();
private:
};
#endif
include/Engine/Network/HybridServer.h
-12
View File
@@ -1,12 +0,0 @@
#ifndef HybridServer_h__
#define HybridServer_h__
class HybridServer
{
public:
HybridServer();
~HybridServer();
private:
};
#endif