Merge branch 'master' into Movement

# Conflicts: # include/Engine/Network/Client.h # resources/DefaultConfig.ini # resources/Schema/Entities/OverwatchCamera.xml # resources/Schema/Types/Entity.xsd
2016-03-13 22:22:36 +01:00
parent d587c9a692 77bb7a0f5c
commit a715f7fe86
47 changed files with 13403 additions and 10818 deletions
@@ -72,6 +72,7 @@
 							<xs:element ref="c:ServerIdentity" minOccurs="0"/>
 							<xs:element ref="c:ServerList" minOccurs="0"/>
 							<xs:element ref="c:EndScreen" minOccurs="0"/>
+							<xs:element ref="c:Unpickable" minOccurs="0"/>
 							<xs:element ref="c:Fade" minOccurs="0"/>
 							<xs:element ref="c:ConfigBtnResolution" minOccurs="0"/>
 							<xs:element ref="c:ConfigBtnFloat" minOccurs="0"/>