Merge remote-tracking branch 'origin/Importer' into Animations

# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/RenderingWorld.xml # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/Skeleton.cpp
2016-02-09 22:50:19 +01:00
parent 3c22dcc165 060e674a6f
commit c09c2f4783
115 changed files with 4572 additions and 930 deletions
@@ -31,6 +31,7 @@
 							<xs:element ref="c:PlayerSpawn" minOccurs="0"/>
 							<xs:element ref="c:Team" minOccurs="0"/>
 							<xs:element ref="c:DirectionalLight" minOccurs="0"/>
+							<xs:element ref="c:SceneLight" minOccurs="0"/>
 							<xs:element ref="c:UniformScale" minOccurs="0"/>
 							<xs:element ref="c:EditorWidget" minOccurs="0"/>
 							<xs:element ref="c:Lifetime" minOccurs="0"/>