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

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

Browse Source 
# Conflicts:
#	resources/Schema/Entities/Player.xml
This commit is contained in:
Tleety
2016-03-02 22:49:26 +01:00
parent 2cb4a307eb 6507efc0db
commit e1ca104fc9
9 changed files with 154 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+1
View File
@@ -58,4 +58,5 @@
<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>