Merge branch 'master' into JumpHeightAdjustment

# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/Player.xml # resources/Schema/Entities/PlayerRed.xml # src/Game/Systems/PlayerMovementSystem.cpp
2016-02-29 17:28:40 +01:00
parent cd315bbaa0 bb76c9d248
commit c7dad79e72
59 changed files with 1550 additions and 772 deletions
@@ -4,4 +4,5 @@
 	<CrouchSpeed>1.5</CrouchSpeed>
 	<JumpSpeed>4.0</JumpSpeed>
 	<CurrentWishDirection X="0" Y="0" Z="0"/>
+	<CurrentWeapon></CurrentWeapon>
 </Player>