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

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
parent 55ee2bb3bf ea9c4d19d0
commit 90867b094a
23 changed files with 741 additions and 96 deletions
@@ -16,6 +16,7 @@
 							<xs:element ref="c:RaptorCopter" minOccurs="0"/>
 							<xs:element ref="c:Player" minOccurs="0"/>
 							<xs:element ref="c:Camera" minOccurs="0"/>
+							<xs:element ref="c:Text" minOccurs="0"/>
 							<xs:element ref="c:AABB" minOccurs="0"/>
 							<xs:element ref="c:Trigger" minOccurs="0"/>
 							<xs:element ref="c:Health" minOccurs="0"/>