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

# Conflicts: # include/Game/Game.h
2016-01-21 10:19:32 +01:00
parent f3bfe388af 70cab9ef30
commit ea9c4d19d0
62 changed files with 2632 additions and 1005 deletions
@@ -20,7 +20,7 @@
 #include "Core/EntityFileParser.h"
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
-
+#include "Systems/InterpolationSystem.h"
 // Network
 #include <boost/thread.hpp>
 #include "Network/Network.h"
@@ -48,8 +48,8 @@ private:
    InputProxy* m_InputProxy;
 	GUI::Frame* m_FrameStack;
    World* m_World;
-    Octree* m_OctreeCollision;
-    Octree* m_OctreeFrustrumCulling;
+    Octree<AABB>* m_OctreeCollision;
+    Octree<AABB>* m_OctreeFrustrumCulling;
    SystemPipeline* m_SystemPipeline;
    RenderFrame* m_RenderFrame;
    // Network variables