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
@@ -15,6 +15,7 @@
 					<xs:annotation><xs:documentation>Vertical velocity set when jumping.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="CurrentWishDirection" type="t:Vector" minOccurs="0"/>
+				<xs:element name="CurrentWeapon" type="t:string" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>