Merge branch 'master' into DDS

BTH/axyz

Conflicts:
	assets
	include/Engine/Core/ResourceManager.h
	include/Engine/Rendering/Image.h
	include/Engine/Rendering/TextureSprite.h
	resources/Schema/Entities/MovementTest.xml
	resources/Shaders/ForwardPlus.frag.glsl
	resources/Shaders/ForwardPlusShieldCheck.frag.glsl
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/Texture.cpp
	src/Game/Game.cpp

This commit is contained in:

Teejoon

2016-03-14 02:51:45 +01:00

parent d6f0528a87 a4c35e5908

commit 8151e9a9a4

271 changed files with 46496 additions and 28292 deletions

									
										include/Engine/Rendering/TextureSprite.h
									
		-1
	
												View File
												
				@@ -14,7 +14,6 @@ protected:

					TextureSprite(std::string path);

				public:

					~TextureSprite() {};

				};

				#endif