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/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/RenderSystem.cpp
This commit is contained in:
viktorljung
2016-01-23 11:48:10 +01:00
parent e4513376bb 64a7239b17
commit 9a23d8887a
95 changed files with 2520 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+2
View File
@@ -21,4 +21,6 @@
<xs:include schemaLocation="Components/SpawnPoint.xsd"/>
<xs:include schemaLocation="Components/PlayerSpawn.xsd"/>
<xs:include schemaLocation="Components/Team.xsd"/>
<xs:include schemaLocation="Components/UniformScale.xsd"/>
<xs:include schemaLocation="Components/EditorWidget.xsd"/>
</xs:schema>