Merge remote-tracking branch 'origin/master' into Forward+

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-01-08 14:14:43 +01:00
parent dab4ba2164 13ade6d7f2
commit 2bd60be741
25 changed files with 639 additions and 67 deletions
@@ -15,6 +15,7 @@
 							<xs:element ref="c:Test" minOccurs="0"/>
 							<xs:element ref="c:RaptorCopter" minOccurs="0"/>
 							<xs:element ref="c:Player" minOccurs="0"/>
+							<xs:element ref="c:Health" minOccurs="0"/>
 							<xs:element ref="c:PointLight" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>