diff --git a/changeAppSettings.sh b/changeAppSettings.sh index c37149e6d..6f1e14cd6 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -478,10 +478,10 @@ fi if [ -z "$TouchscreenKeysTheme" -o -z "$AUTO" ]; then echo echo "On-screen keys theme" -echo "1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" -echo "2 = Simple Theme by Beholder (white, with gamepad joystick)" -echo "3 = Sun by Sirea (yellow, with round joystick)" -echo "4 = Keen by Gerstrong (multicolor, with round joystick)" +echo "0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" +echo "1 = Simple Theme by Beholder (white, with gamepad joystick)" +echo "2 = Sun by Sirea (yellow, with round joystick)" +echo "3 = Keen by Gerstrong (multicolor, with round joystick)" echo "" echo -n "($TouchscreenKeysTheme): " read var @@ -898,10 +898,10 @@ echo "# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separate echo RedefinedKeysScreenKbNames=\"$RedefinedKeysScreenKbNames\" >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# On-screen keys theme" >> AndroidAppSettings.cfg -echo "# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" >> AndroidAppSettings.cfg -echo "# 2 = Simple Theme by Beholder (white, with gamepad joystick)" >> AndroidAppSettings.cfg -echo "# 3 = Sun by Sirea (yellow, with round joystick)" >> AndroidAppSettings.cfg -echo "# 4 = Keen by Gerstrong (multicolor, with round joystick)" >> AndroidAppSettings.cfg +echo "# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" >> AndroidAppSettings.cfg +echo "# 1 = Simple Theme by Beholder (white, with gamepad joystick)" >> AndroidAppSettings.cfg +echo "# 2 = Sun by Sirea (yellow, with round joystick)" >> AndroidAppSettings.cfg +echo "# 3 = Keen by Gerstrong (multicolor, with round joystick)" >> AndroidAppSettings.cfg echo TouchscreenKeysTheme=$TouchscreenKeysTheme >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Redefine gamepad keys to SDL keysyms, button order is:" >> AndroidAppSettings.cfg diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 11631e379..9357e84fa 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -133,14 +133,21 @@ AppTouchscreenKeyboardKeysAmount=6 AppTouchscreenKeyboardKeysAmountAutoFire=0 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="RETURN BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN" +RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu RedefinedKeysScreenKbNames="Change_weapon Sniper_view Show_scores Quick_rotate Fire Jump" +# On-screen keys theme +# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) +# 1 = Simple Theme by Beholder (white, with gamepad joystick) +# 2 = Sun by Sirea (yellow, with round joystick) +# 3 = Keen by Gerstrong (multicolor, with round joystick) +TouchscreenKeysTheme=2 + # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb -RedefinedKeysGamepad="RETURN BACKSPACE TAB END SPACE LCTRL SPACE LCTRL V E" +RedefinedKeysGamepad="SLASH BACKSPACE TAB END SPACE LCTRL SPACE LCTRL V E" # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 57aeefafb..07c011b6c 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 57aeefafb2f4b1551e5cec8041e7636e4ff31ab7 +Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index f09763479..4b83db91a 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit f0976347952195fbabf83c8d23de3262a5f84207 +Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg index a001de7fa..2ae6472a7 100644 --- a/project/jni/application/teeworlds/AndroidAppSettings.cfg +++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg @@ -103,7 +103,7 @@ AppUsesSecondJoystick=y AppUsesAccelerometer=n # Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 -AppUsesGyroscope=n +AppUsesGyroscope=y # Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 AppUsesMultitouch=n @@ -139,11 +139,11 @@ RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RETURN RCTRL" RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire" # On-screen keys theme -# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) -# 2 = Simple Theme by Beholder (white, with gamepad joystick) -# 3 = Sun by Sirea (yellow, with round joystick) -# 4 = Mystery by Gerstrong (unknown color, unknown joystick) -TouchscreenKeysTheme=3 +# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) +# 1 = Simple Theme by Beholder (white, with gamepad joystick) +# 2 = Sun by Sirea (yellow, with round joystick) +# 3 = Mystery by Gerstrong (unknown color, unknown joystick) +TouchscreenKeysTheme=2 # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb @@ -170,10 +170,10 @@ MultiABI=y AppMinimumRAM=0 # Application version code (integer) -AppVersionCode=06213 +AppVersionCode=06214 # Application user-visible version name (string) -AppVersionName="0.6.2.13" +AppVersionName="0.6.2.14" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y @@ -209,7 +209,7 @@ AppCmdline='' # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?) -ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump^ouya:' +ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump\\\\nTilt your phone/tablet to jump^ouya:' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index e2be6d4a7..34b64249c 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit e2be6d4a7db36f167e559d10572d6ab18dac912d +Subproject commit 34b64249c46a90ce127f32b3ef41a565b8a70a61 diff --git a/todo.txt b/todo.txt index 331da6055..66416b422 100644 --- a/todo.txt +++ b/todo.txt @@ -20,8 +20,6 @@ Requested features, might never get implemented TODO, which will get actually done ================================== -- TeeWorlds: add accelerometer jump, improve touchscreen controls if possible. - - TeeWorlds: fix Ouya bugs (whole-screen shrink, remove controls from settings), submit to Ouya store. - UQM: On-screen buttons are re-appearing when using gamepad and switching between game screens. @@ -32,8 +30,6 @@ TODO, which will get actually done - OpenArena: move 3-rd person camera to the side, above shoulder. -- OpenArena: finish Ouya port. - - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper. - UfoAI: huge huge update. \ No newline at end of file