2 Commits

Author	SHA1	Message	Date
viktorljung	2a93e2ae7f	Merge remote-tracking branch 'origin/master' into TextRendering ... # Conflicts: # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderSystem.h # include/Game/Game.h # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp	2016-01-18 17:44:26 +01:00
viktorljung	123c198e19	Text component added and Text render queue	2015-12-14 14:48:24 +01:00