Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch

2015-10-08 15:47:27 +02:00
parent 6669d91a90 18ffddb2ac
commit 040b0f9461
4 changed files with 526 additions and 1 deletions
@@ -33,7 +33,7 @@ void dd::Systems::LevelSystem::Initialize()
    cPhys->Mask = CollisionLayer::Type::Ball;
    transform->Sticky = false;

-    model->ModelFile = "Models/Brick/TurquoiseBrick.obj";
+    model->ModelFile = "Models/Brick/WhiteBrick.obj";
    transform->Position = glm::vec3(50, 50, -10);

    //sound