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

# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd
2016-03-03 22:56:39 +01:00
parent 011aa53bc0 c467d54d44
commit 0a21fe15dd
44 changed files with 12332 additions and 2416 deletions
@@ -63,6 +63,7 @@
 							<xs:element ref="c:DoubleJump" minOccurs="0"/>
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
+							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
 							<xs:element ref="c:ScoreScreen" minOccurs="0"/>
 							<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
 						</xs:all>