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

BTH/axyz

# Conflicts:
#	include/Engine/Common.h
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

This commit is contained in:

stiffly

2016-01-25 01:21:15 +01:00

parent 382e00cff4 04f6233d99

commit 44baa47bba

251 changed files with 11834 additions and 3294 deletions

									
										include/Engine/Common.h
									
		+1
		
												View File
												
				@@ -4,6 +4,7 @@

				#include <vector>

				#include <map>

				#include <unordered_map>

				#include <algorithm>

				#include <array>

				#include "Core/Util/Logging.h"