viktorljung 6fbb962b5e Merge branch 'Rendering' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Engine/Rendering/ShaderProgram.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-01-15 13:23:42 +01:00

..

Components

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

Entities

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

2016-01-12 16:13:20 +01:00

Types

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

Components.xsd

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

Types.xsd

Added Model component to schema

2015-12-08 18:21:24 +01:00

xml.xsd

Updated schema

2015-11-25 18:04:11 +01:00