Merge branch 'master' of github.com:tollyx/dungeon

This commit is contained in:
Adrian Hedqvist 2017-09-18 18:07:01 +02:00
commit b6fb433457
2 changed files with 3 additions and 1 deletions

1
.gitignore vendored
View file

@ -27,6 +27,7 @@ compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
# Misc # Misc
build
*.cfg *.cfg
*.log *.log
imgui.ini imgui.ini

View file

@ -24,6 +24,7 @@ int main(int argc, char* argv[]) {
Renderer* renderer; Renderer* renderer;
Input* input; Input* input;
setenv("MESA_DEBUG", "", 0);
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE); SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE);
Config cfg = Config("dungeon.cfg"); Config cfg = Config("dungeon.cfg");