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

Merge branch 'master' into JumpHeightAdjustment

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp
This commit is contained in:
William Moberg
2016-02-29 17:28:40 +01:00
parent cd315bbaa0 bb76c9d248
commit c7dad79e72
59 changed files with 1550 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+2
View File
@@ -47,4 +47,6 @@
<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:schema>