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

# Conflicts: # src/Game/Systems/PlayerMovementSystem.cpp
2016-02-03 09:52:54 +01:00
parent 7987d4b27c 24aac6a00d
commit 73ab9bb4c6
44 changed files with 544 additions and 154 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;