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

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

Browse Source 
# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h
#	src/Game/Game.cpp
This commit is contained in:
verysecrethero
2016-03-02 16:47:43 +01:00
parent b81bb9eeea 2fb3bb2a39
commit 62653cf65d
195 changed files with 6812 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+8
View File
@@ -46,5 +46,13 @@
<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/SpriteIndicator.xsd"/>
<xs:include schemaLocation="Components/Button.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>