Merge branch 'master' into Respawning

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-03-02 16:51:24 +01:00
parent 91dbbb9c11 f8f4b4d939
commit 4ef76f6c45
14 changed files with 9662 additions and 44 deletions
@@ -52,6 +52,7 @@
 							<xs:element ref="c:Button" minOccurs="0"/>
 							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
+							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
 							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
 							<xs:element ref="c:HealthPickup" minOccurs="0"/>
 							<xs:element ref="c:CapturePointGameMode" minOccurs="0"/>