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

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-03-02 17:50:59 +01:00
parent 53c520123a 01def459a1
commit e6b3bbeb54
18 changed files with 331 additions and 95 deletions
@@ -53,6 +53,7 @@
 							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
 							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
+							<xs:element ref="c:FloatingEffect" minOccurs="0"/>
 							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
 							<xs:element ref="c:HealthPickup" minOccurs="0"/>
 							<xs:element ref="c:CapturePointGameMode" minOccurs="0"/>