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

This commit is contained in:
viktorljung
2016-03-14 01:20:20 +01:00
9 changed files with 6544 additions and 6083 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