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

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

Browse Source 
# Conflicts:
#	include/Game/Game.h
This commit is contained in:
viktorljung
2016-01-21 10:19:32 +01:00
parent f3bfe388af 70cab9ef30
commit ea9c4d19d0
62 changed files with 2632 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Types/Entity.xsd
+3 -2
View File
@@ -20,6 +20,7 @@
<xs:element ref="c:AABB" minOccurs="0"/>
<xs:element ref="c:Trigger" minOccurs="0"/>
<xs:element ref="c:Health" minOccurs="0"/>
<xs:element ref="c:CapturePoint" minOccurs="0"/>
<xs:element ref="c:PointLight" minOccurs="0"/>
<xs:element ref="c:Listener" minOccurs="0"/>
<xs:element ref="c:SoundEmitter" minOccurs="0"/>
@@ -40,7 +41,7 @@
<xs:element name="EntityRef" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
<xs:attribute name="file" type="xs:string" minOccurs="0"/>
<xs:attribute name="file" type="xs:string" minOccurs="0"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -49,7 +50,7 @@
</xs:element>
</xs:all>
<xs:attribute ref="xml:base"/>
<xs:attribute name="name" type="xs:string" minOccurs="0" default=""/>
<xs:attribute name="name" type="xs:string" minOccurs="0" default=""/>
</xs:complexType>
</xs:element>
</xs:schema>