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

2016-02-02 14:22:00 +01:00
parent 0c97ce7a4a 0e5f6da9a9
commit 2085d9ec9e
42 changed files with 527 additions and 148 deletions
@@ -51,6 +51,7 @@ private:
 	GUI::Frame* m_FrameStack;
    World* m_World;
    Octree<EntityAABB>* m_OctreeCollision;
+    Octree<EntityAABB>* m_OctreeTrigger;
    Octree<EntityAABB>* m_OctreeFrustrumCulling;
    SystemPipeline* m_SystemPipeline;
    RenderFrame* m_RenderFrame;