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
@@ -9,4 +9,5 @@
 	<xs:include schemaLocation="Components/AABB.xsd"/>
 	<xs:include schemaLocation="Components/PointLight.xsd"/>
 	<xs:include schemaLocation="Components/Trigger.xsd"/>
+	<xs:include schemaLocation="Components/Health.xsd"/>
 </xs:schema>