stiffly 1cdcbf9b32 Merge remote-tracking branch 'origin/master' into Sound ...

# Conflicts:
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

2016-02-12 08:19:29 +01:00

..

Engine

Enabled server broadcasting PlayerDamage events to other players to make damage indicators work

2016-02-12 07:03:14 +01:00

Game

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

2016-02-12 08:19:29 +01:00