Merge branch 'master' into LevelSystemAndSuch

2015-10-05 13:26:51 +02:00
parent e120b09b84 a8b0631379
commit b2399243e3
7 changed files with 166 additions and 79 deletions
@@ -73,9 +73,11 @@ private:
    glm::vec3 m_Acceleration = glm::vec3(0.f, 0.f, 0.f);
    bool m_Left = false;
    bool m_Right = false;
+    bool m_ReplaceBall = false;
+    bool m_MultiBall = false;
    float m_Edge = 2.8f;
-    Components::Transform* m_Transform;
-    Components::Pad* m_Pad;
+    Components::Transform* m_Transform = nullptr;
+    Components::Pad* m_Pad = nullptr;

    bool m_Pause = false;