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

# Conflicts: # include/Engine/Core/EPlayerDamage.h # src/Game/Game.cpp # src/Game/Systems/Weapon/WeaponSystem.cpp
2016-02-11 22:52:51 +01:00
parent d1213f9f59 06f614b3bb
commit 7cae84d4ee
13 changed files with 827 additions and 87 deletions
@@ -94,3 +94,5 @@ bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
    // TODO: Select the active one specified by player component
    return true;
 }
+
+    ePlayerDamage.PlayerShooter = eShoot.Player;