3 Commits

Author	SHA1	Message	Date
Jace	7e12d00874	Merge branch 'master' into CoolDeathAnimation ... # Conflicts: # include/Engine/Rendering/ModelJob.h # resources/Shaders/ForwardPlus.frag.glsl # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/RenderSystem.cpp	2016-01-27 10:43:23 +01:00
Ayumiwii	77e1dacb6f	Merge	2016-01-19 09:58:52 +01:00
Ayumiwii	37aa1eaa18	Merge remote-tracking branch 'origin/master' into CoolDeathAnimation ... # Conflicts: # include/Engine/Rendering/DrawScenePass.h # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderQueueFactory.h # include/Engine/Rendering/Renderer.h # include/Game/Game.h # resources/Schema/Components.xsd # resources/Schema/Entities/Test.xml # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/DrawScenePass.cpp # src/Engine/Rendering/RenderQueueFactory.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp	2016-01-18 16:02:43 +01:00