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

# Conflicts: # include/Game/Systems/Weapon/DefenderWeaponBehaviour.h # resources/Schema/Components.xsd # resources/Schema/Entities/CP_Rocky2.xml # resources/Schema/Entities/MuzzleFlashBlue.xml # resources/Schema/Entities/MuzzleFlashFire.xml # resources/Schema/Entities/MuzzleFlashRed.xml # resources/Schema/Types/Entity.xsd # resources/Shaders/Sprite.frag.glsl # src/Game/Systems/AbilityCooldownHUDSystem.cpp # src/Game/Systems/BoostIconsHUDSystem.cpp # src/Game/Systems/PlayerMovementSystem.cpp # src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp # src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp # src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
2016-03-13 15:17:15 +01:00
parent 7d899a989c b73595eed0
commit 44f46cda8d
156 changed files with 25815 additions and 19649 deletions
@@ -33,7 +33,7 @@ private:
    // 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);
+    void playerStep(double dt, EntityWrapper player);
    // Spawn a hexagon at origin of an Entity
    void spawnHexagon(EntityWrapper target);