Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
This commit is contained in:
stiffly
2016-03-08 10:39:52 +01:00
147 changed files with 39481 additions and 3742 deletions
@@ -30,6 +30,8 @@ private:
bool m_LeftFoot = false;
// To get a difference when calculating the walking state.
glm::vec3 m_LastPosition = glm::vec3();
// Used to track afterimages for sprint effect.
float m_SprintEffectTimer;
// 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