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

Merge remote-tracking branch 'origin/master' into Boost-icons

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
This commit is contained in:
Tleety
2016-03-02 21:51:52 +01:00
parent 8b81ba9019 76117cb3ce
commit a339c61f5b
29 changed files with 6198 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+1
View File
@@ -56,5 +56,6 @@
<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
</xs:schema>