Merge remote-tracking branch 'origin/master' into DefenderShield

# Conflicts: # resources/Schema/Components.xsd
2016-02-08 12:30:41 +01:00
parent 2ee21e05d4 5987751add
commit 971beb29d8
62 changed files with 1654 additions and 429 deletions
@@ -30,6 +30,8 @@
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
+	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
+	<xs:include schemaLocation="Components/DashAbility.xsd"/>
 	<xs:include schemaLocation="Components/Shield.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
 </xs:schema>