Merge branch 'master' into BoxModelCollision

# Conflicts: # include/Engine/Core/Octree.h # resources/Schema/Entities/CollisionTestLevel.xml # src/Engine/Collision/CollisionSystem.cpp # src/Engine/Core/Octree.cpp
2016-01-27 10:52:27 +01:00
parent 6ea490e215 505a6c7396
commit 90f05442aa
145 changed files with 6062 additions and 1105 deletions
@@ -27,7 +27,7 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
    //    }
    //    if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
    //        (glm::vec3&)cTransform["Position"] += resolutionVector;
-    //        cPhysics["Velocity"] = glm::vec3(0, 0, 0);
+    //        ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
    //    }
    //}