Jace 47f4711b85 Merge remote-tracking branch 'origin/Menu' into WeaponSystem ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Systems/PlayerSpawnSystem.cpp

2016-02-12 07:18:20 +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/Menu' into WeaponSystem

2016-02-12 07:18:20 +01:00