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

# Conflicts: # src/Engine/Rendering/RenderState.cpp # src/Game/Game.cpp
2015-12-15 11:50:01 +01:00
parent b698a0d36f 51dd627ae3
commit 0a8a9e5099
42 changed files with 1153 additions and 237 deletions
@@ -17,6 +17,7 @@
 #include "Core/SystemPipeline.h"
 #include "RaptorCopterSystem.h"
 #include "PlayerSystem.h"
+#include "Editor/EditorSystem.h"

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