Merge remote-tracking branch 'origin/master' into HUD-Timers

# Conflicts: # resources/Schema/Entities/Player.xml
2016-03-02 22:49:26 +01:00
parent 2cb4a307eb 6507efc0db
commit e1ca104fc9
9 changed files with 154 additions and 31 deletions
@@ -54,6 +54,7 @@
 							<xs:element ref="c:AbilityCooldownHUD" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
 							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
+							<xs:element ref="c:BoostIconsHUD" minOccurs="0"/>
 							<xs:element ref="c:FloatingEffect" minOccurs="0"/>
 							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
 							<xs:element ref="c:HealthPickup" minOccurs="0"/>