Teejoon 8151e9a9a4 Merge branch 'master' into DDS ...

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

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

..

Engine

Merge branch 'master' into DDS

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

Game

Merge branch 'master' into DashEffect

2016-03-13 23:25:38 +01:00