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

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
parent 55ee2bb3bf ea9c4d19d0
commit 90867b094a
23 changed files with 741 additions and 96 deletions
@@ -19,6 +19,7 @@
 #include "Rendering/RenderSystem.h"
 #include "Core/EntityFileParser.h"
 #include "Core/Octree.h"
+#include "Rendering/Font.h"
 #include "Systems/InterpolationSystem.h"
 // Network
 #include <boost/thread.hpp>