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

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates

Browse Source 
Conflicts:
	include/Engine/Rendering/SpriteJob.h
	resources/Schema/Components.xsd
	resources/Schema/Entities/Player.xml
	resources/Schema/Entities/PlayerRed.xml
This commit is contained in:
Teejoon
2016-02-22 16:43:18 +01:00
parent c4d3c515e4 2c18068059
commit 6fab971734
92 changed files with 2596 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+3
View File
@@ -41,6 +41,9 @@
<xs:include schemaLocation="Components/Shielded.xsd"/>
<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
<xs:include schemaLocation="Components/Menu.xsd"/>
<xs:include schemaLocation="Components/KillFeed.xsd"/>
<xs:include schemaLocation="Components/Page.xsd"/>
<xs:include schemaLocation="Components/Indicator.xsd"/>
<xs:include schemaLocation="Components/Button.xsd"/>
</xs:schema>