Merge branch 'PlayerSystem' into Networking

# Conflicts: # src/Game/Game.cpp
2015-12-11 15:45:27 +01:00
parent 23c3f0709b 3da69c8a1b
commit 15442c8c75
14 changed files with 250 additions and 110 deletions
@@ -13,6 +13,7 @@
 #include "Core/EntityXMLFile.h"
 #include "Core/SystemPipeline.h"
 #include "RaptorCopterSystem.h"
+#include "PlayerSystem.h"

 // Network
 #include <boost/thread.hpp>