Merge branch 'master' into BoxModelCollision

# Conflicts: # src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
parent 428dca003d ff26e1235c
commit e3a44d37d2
55 changed files with 2450 additions and 217 deletions
@@ -9,9 +9,9 @@
 class CollidableOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
        : System(world, eventBroker)
-        , PureSystem("Collidable")
+        , PureSystem(componentType)
        , m_Octree(octree)
    { }