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

This commit is contained in:
Tleety
2016-02-10 15:01:51 +01:00
46 changed files with 1453 additions and 371 deletions
+1
View File
@@ -30,6 +30,7 @@
<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/Sprite.xsd"/>
</xs:schema>