Commit Graph

9 Commits

Author SHA1 Message Date
Teejoon a3f215831d Fixed DDS after merge 2016-03-14 06:09:06 +01:00
Teejoon 0382708b85 Fixed so that we could use DTX5nm as normal map 2016-03-10 19:57:01 +01:00
Teejoon d8f9f15d34 Merge branch 'master' into DDS
Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp
2016-03-10 19:55:25 +01:00
Tleety 1104166039 TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes 2016-03-09 17:24:21 +01:00
Jace ffa9d7e607 WIP 2016-03-02 18:06:20 +01:00
Tleety 91b0ac5fbd Some groundwork for cubemaps. 2016-02-23 16:00:43 +01:00
viktorljung 9bd3da409d Added Font to ResourceManager 2015-12-11 16:53:51 +01:00
sippeangelo 872879c013 Engine puzzle completed 2015-11-30 17:02:24 +01:00
sippeangelo 16eb70dd59 Added Model and related classes 2015-11-24 10:55:54 +01:00