BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/NewMapWSpectatorCam.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Game.cpp
This commit is contained in:
Tleety
2016-03-09 11:49:42 +01:00
parent 95f68cc888 00478b4f12
commit 704242597a
29 changed files with 3270 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Types/Entity.xsd
+1
View File
@@ -68,6 +68,7 @@
<xs:element ref="c:InputCmdButton" minOccurs="0"/>
<xs:element ref="c:ScoreScreen" minOccurs="0"/>
<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
<xs:element ref="c:NetworkComponent" minOccurs="0"/>
<xs:element ref="c:ServerIdentity" minOccurs="0"/>
<xs:element ref="c:ServerList" minOccurs="0"/>
</xs:all>