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

# Conflicts: # src/Engine/Rendering/Texture.cpp # src/Game/Game.cpp
2016-02-11 14:43:30 +01:00
parent 350effd8eb bbbab7b287
commit f0ae365401
106 changed files with 4052 additions and 940 deletions
@@ -39,6 +39,7 @@
 							<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:AssaultWeapon" minOccurs="0"/>
 							<xs:element ref="c:Shield" minOccurs="0"/>
 							<xs:element ref="c:Shielded" minOccurs="0"/>
 							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>