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

# Conflicts: # include/Engine/Rendering/DrawFinalPass.h # resources/Schema/Components.xsd # resources/Schema/Entities/CollisionTestLevel.xml # resources/Schema/Types/Entity.xsd # src/Engine/Collision/Collision.cpp # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/RenderSystem.cpp
2016-02-10 11:33:45 +01:00
parent 97be22c4a5 067780c93f
commit 49e6252ee1
81 changed files with 2667 additions and 521 deletions
@@ -39,6 +39,8 @@
 							<xs:element ref="c:Fill" minOccurs="0"/>
 							<xs:element ref="c:Animation" minOccurs="0"/>
 							<xs:element ref="c:BoneAttachment" minOccurs="0"/>
+							<xs:element ref="c:Shield" minOccurs="0"/>
+							<xs:element ref="c:Shielded" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>