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
parent 78e318c032 f146971db0
commit 47f4711b85
13 changed files with 1593 additions and 12 deletions
@@ -44,6 +44,7 @@
 							<xs:element ref="c:Shielded" minOccurs="0"/>
 							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>
 							<xs:element ref="c:AmmunitionHUD" minOccurs="0"/>
+							<xs:element ref="c:KillFeed" minOccurs="0"/>
 							<xs:element ref="c:Sprite" minOccurs="0"/>
 							<xs:element ref="c:AnimationOffset" minOccurs="0"/>
 						</xs:all>