BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into HUD-Timers

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/PlayerRed.xml
#	resources/Schema/Types/Entity.xsd
This commit is contained in:
Tleety
2016-03-02 14:22:13 +01:00
parent 144e548b7a 2fb3bb2a39
commit 502a290d36
98 changed files with 3255 additions and 1425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+4
View File
@@ -47,4 +47,8 @@
<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
<xs:include schemaLocation="Components/Button.xsd"/>
<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
<xs:include schemaLocation="Components/DoubleJump.xsd"/>
<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
</xs:schema>