Merge branch 'master' into Dirtybit

# Conflicts: # include/Engine/Sound/SoundManager.h
2016-03-13 00:58:45 +01:00
parent 993e56ec59 7ea90bede7
commit 95f9065037
28 changed files with 378 additions and 26566 deletions
@@ -5,6 +5,7 @@
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
+#include "Sound/EPlaySoundOnEntity.h"

 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {