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

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-01-15 16:25:32 +01:00
parent be33dfbd69 ce8dcd3022
commit 5c45dbdd10
46 changed files with 1306 additions and 347 deletions
@@ -16,6 +16,7 @@
 							<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:element ref="c:Listener" minOccurs="0"/>
 							<xs:element ref="c:SoundEmitter" minOccurs="0"/>
 						</xs:all>