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

BTH/axyz

# 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

This commit is contained in:

Ayumiwii

2016-01-18 16:02:43 +01:00

parent 1411964dcf bf3f8aea89

commit 37aa1eaa18

212 changed files with 7177 additions and 2731 deletions

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

				#include <memory>

				#include <string>

				#include <sstream>

				#include <vector>

				#include <map>

				#include <unordered_map>