From 0730eb4c491d15504e85fcfbcc0f16ed687b6694 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 17 Oct 2018 21:56:04 +0200 Subject: [PATCH 1/2] Disable text input since this is on by default in SDL2.0 This has been causing some "jitter" I'm quite sure. Disabling text input should help remedy this. --- .vimrc | 2 +- src/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index d7501ab..4bc6a39 100644 --- a/.vimrc +++ b/.vimrc @@ -5,5 +5,5 @@ nnoremap :ter ++close ./_build/debug/breakhack packadd termdebug let g:termdebug_wide = 1 -let g:syntastic_c_include_dirs = [ '_build', '/usr/include/SDL2', 'steamworks_c_wrapper/src' ] +let g:syntastic_c_include_dirs = [ '_build/debug', '/usr/include/SDL2', 'steamworks_c_wrapper/src' ] let g:syntastic_cpp_include_dirs = [ 'steamworks_c_wrapper/sdk/public/steam' ] diff --git a/src/main.c b/src/main.c index 5ac7bb9..3166bb9 100644 --- a/src/main.c +++ b/src/main.c @@ -250,6 +250,11 @@ bool initSDL(void) SDL_GetError()); return false; } + + if (SDL_IsTextInputActive()) { + debug("Disabling text input"); + SDL_StopTextInput(); + } return true; } From a90321e3774bd479ed7ec1eacb5a5814dd8d4178 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 17 Oct 2018 21:57:27 +0200 Subject: [PATCH 2/2] Patch version raised to --- CMakeLists.txt | 2 +- build/releasenotes/v1.1.5.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 build/releasenotes/v1.1.5.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d1b658..05f2642 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 4) +set(breakhack_PATCH_VERSION 5) set(breakhack_RELEASE_TYPE "") include(FindLua) diff --git a/build/releasenotes/v1.1.5.txt b/build/releasenotes/v1.1.5.txt new file mode 100644 index 0000000..9a52beb --- /dev/null +++ b/build/releasenotes/v1.1.5.txt @@ -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