4 Commits

Author	SHA1	Message	Date
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
Jace	ce0d3b9fbe	Fixed texture freeing. Destructor was never called because base destructors weren't virtual.	2016-03-12 17:53:34 +01:00
Jace	ffa9d7e607	WIP	2016-03-02 18:06:20 +01:00
sippeangelo	52278d7bc2	More CMake bullshit	2015-11-30 11:16:43 +01:00