Merge branch 'Cleanup'

# Conflicts: # src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:37:26 +01:00
parent 0334ec3fa7 5fcd26cd3e
commit dec2234019
31 changed files with 209 additions and 160 deletions
@@ -28,4 +28,5 @@
 	<xs:include schemaLocation="Components/Animation.xsd"/>
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
+	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 </xs:schema>