Merge branch 'master' into Importer

2016-03-14 01:09:18 +01:00
parent dea57b4872 50abeda99a
commit 7e6830af35
15 changed files with 3975 additions and 3836 deletions
@@ -32,6 +32,8 @@ private:
    glm::vec3 m_LastPosition = glm::vec3();
    // Used to track afterimages for sprint effect.
    float m_SprintEffectTimer;
+    // Used to track afterimages for dash effect.
+    float m_DashEffectTimer;
    // The logic for making the sound play when player is moving
    void playerStep(double dt, EntityWrapper player);
    // Spawn a hexagon at origin of an Entity