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

2015-09-25 01:03:28 +02:00
parent 181ac60bd0 bc6b037923
commit 0e6fcfb2ba
3 changed files with 838 additions and 838 deletions
@@ -109,7 +109,7 @@ EntityID dd::Systems::PadSystem::CreateBall()
    std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
    physics->Static = false;

-    cball->Speed = 10;
+    cball->Speed = 5.f;

    m_World->CommitEntity(ent);