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

# Conflicts:
#	README.md
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
This commit is contained in:
stiffly
2016-01-12 14:50:10 +01:00
50 changed files with 2015 additions and 840 deletions
+1
View File
@@ -8,6 +8,7 @@
<xs:include schemaLocation="Components/Player.xsd"/>
<xs:include schemaLocation="Components/AABB.xsd"/>
<xs:include schemaLocation="Components/Trigger.xsd"/>
<xs:include schemaLocation="Components/Health.xsd"/>
<xs:include schemaLocation="Components/Listener.xsd"/>
<xs:include schemaLocation="Components/SoundEmitter.xsd"/>
</xs:schema>