Merge branch 'master' into dev

Conflicts:
	CMakeLists.txt
This commit is contained in:
Linus Probert 2018-10-18 14:08:48 +02:00
commit 669a2fb029
2 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1,8 @@
0730eb4 Disable text input since this is on by default in SDL2.0
7333d3d Update issue templates
70cc79f Merge pull request #47 from Oliveshark/add-code-of-conduct-1
bdbb10b Create CODE_OF_CONDUCT.md
75660a5 Update to readme.
5d1490b Another README badge fix
aefbd95 Update readme to match new github url
90603b4 Fix what my bad build script broke

View File

@ -257,6 +257,11 @@ bool initSDL(void)
SDL_GetError()); SDL_GetError());
return false; return false;
} }
if (SDL_IsTextInputActive()) {
debug("Disabling text input");
SDL_StopTextInput();
}
return true; return true;
} }