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

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
parent bee0630a26 6442254575
commit 47053285c8
16 changed files with 335 additions and 12 deletions
@@ -43,6 +43,7 @@
 							<xs:element ref="c:Shield" minOccurs="0"/>
 							<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:Sprite" minOccurs="0"/>
 							<xs:element ref="c:AnimationOffset" minOccurs="0"/>
 						</xs:all>