diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 6f28771d5..1bcbadd1e 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 6f28771d57ca7d878e3cfee08014651b854b9c7f +Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index f381350b1..87ea8e40a 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit f381350b1b821f0b8a9bccc2071d5fbcdacb016f +Subproject commit 87ea8e40a7c0f3e1ac9ec0c50b367fde5b756c58 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 6627972e5..78af529bd 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 6627972e5ce96439e08b3760865fa4bec0580663 +Subproject commit 78af529bdefd6d0483ca8f3c9ff20c1172741be8 diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg index d885c858b..6525434a1 100644 --- a/project/jni/application/teeworlds/AndroidAppSettings.cfg +++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg @@ -138,6 +138,10 @@ RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RCTRL RETURN" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Fire Hook" +# Redefine gamepad keys to SDL keysyms, button order is: +# A B X Y L1 R1 L2 R2 LThumb RThumb +RedefinedKeysGamepad="RETURN PAGEDOWN TAB T SPACE RCTRL RETURN RCTRL SPACE PAGEDOWN" + # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 @@ -159,10 +163,10 @@ MultiABI=y AppMinimumRAM=0 # Application version code (integer) -AppVersionCode=06212 +AppVersionCode=06213 # Application user-visible version name (string) -AppVersionName="0.6.2.12" +AppVersionName="0.6.2.13" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index d15ccc8e9..ed4762a91 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit d15ccc8e96d4f0c82d8d85d5e6a053df16ad94eb +Subproject commit ed4762a9135be11b2cbcc743e36190c12fadda1f diff --git a/todo.txt b/todo.txt index 6e884f6c3..5d52e7cdf 100644 --- a/todo.txt +++ b/todo.txt @@ -19,10 +19,6 @@ Requested features (see also bugs.txt) - Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported). This is not relevant already, as every device around is fast enough with GL. -- TeeWorlds: jump with gamepad button, remove it from gamepad joystick. - -- TeeWorlds: external mouse support. - - UQM: On-screen buttons are re-appearing when using gamepad and switching between game screens. - UQM: Redesign gamepad controls.