miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Browse Source
This commit is contained in:
Gerhard Stein
2013-09-22 19:25:05 +02:00
parent 1b194b4cbb 767f332849
commit 4606e9c190
7 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
changeAppSettings.sh
View File

@@ -478,10 +478,10 @@ fi
if [ -z "$TouchscreenKeysTheme" -o -z "$AUTO" ]; then if [ -z "$TouchscreenKeysTheme" -o -z "$AUTO" ]; then
echo echo
echo "On-screen keys theme" echo "On-screen keys theme"
echo "1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" echo "0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)"
echo "2 = Simple Theme by Beholder (white, with gamepad joystick)" echo "1 = Simple Theme by Beholder (white, with gamepad joystick)"
echo "3 = Sun by Sirea (yellow, with round joystick)" echo "2 = Sun by Sirea (yellow, with round joystick)"
echo "4 = Keen by Gerstrong (multicolor, with round joystick)" echo "3 = Keen by Gerstrong (multicolor, with round joystick)"
echo "" echo ""
echo -n "($TouchscreenKeysTheme): " echo -n "($TouchscreenKeysTheme): "
read var 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 RedefinedKeysScreenKbNames=\"$RedefinedKeysScreenKbNames\" >> AndroidAppSettings.cfg
echo >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg
echo "# On-screen keys theme" >> AndroidAppSettings.cfg echo "# On-screen keys theme" >> AndroidAppSettings.cfg
echo "# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" >> AndroidAppSettings.cfg echo "# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" >> AndroidAppSettings.cfg
echo "# 2 = Simple Theme by Beholder (white, with gamepad joystick)" >> AndroidAppSettings.cfg echo "# 1 = Simple Theme by Beholder (white, with gamepad joystick)" >> AndroidAppSettings.cfg
echo "# 3 = Sun by Sirea (yellow, with round joystick)" >> AndroidAppSettings.cfg echo "# 2 = Sun by Sirea (yellow, with round joystick)" >> AndroidAppSettings.cfg
echo "# 4 = Keen by Gerstrong (multicolor, with round joystick)" >> AndroidAppSettings.cfg echo "# 3 = Keen by Gerstrong (multicolor, with round joystick)" >> AndroidAppSettings.cfg
echo TouchscreenKeysTheme=$TouchscreenKeysTheme >> AndroidAppSettings.cfg echo TouchscreenKeysTheme=$TouchscreenKeysTheme >> AndroidAppSettings.cfg
echo >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg
echo "# Redefine gamepad keys to SDL keysyms, button order is:" >> AndroidAppSettings.cfg echo "# Redefine gamepad keys to SDL keysyms, button order is:" >> AndroidAppSettings.cfg

11
project/jni/application/openarena/AndroidAppSettings.cfg
View File

@@ -133,14 +133,21 @@ AppTouchscreenKeyboardKeysAmount=6
AppTouchscreenKeyboardKeysAmountAutoFire=0 AppTouchscreenKeyboardKeysAmountAutoFire=0
# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) # 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 # 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" 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: # Redefine gamepad keys to SDL keysyms, button order is:
# A B X Y L1 R1 L2 R2 LThumb RThumb # 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 # How long to show startup menu button, in msec, 0 to disable startup menu
StartupMenuButtonTimeout=3000 StartupMenuButtonTimeout=3000

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 57aeefafb2...07c011b6cc

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: f097634795...4b83db91ab

18
project/jni/application/teeworlds/AndroidAppSettings.cfg
View File

@@ -103,7 +103,7 @@ AppUsesSecondJoystick=y
AppUsesAccelerometer=n AppUsesAccelerometer=n
# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 # 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 # Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0
AppUsesMultitouch=n AppUsesMultitouch=n
@@ -139,11 +139,11 @@ RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RETURN RCTRL"
RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire" RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire"
# On-screen keys theme # On-screen keys theme
# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
# 2 = Simple Theme by Beholder (white, with gamepad joystick) # 1 = Simple Theme by Beholder (white, with gamepad joystick)
# 3 = Sun by Sirea (yellow, with round joystick) # 2 = Sun by Sirea (yellow, with round joystick)
# 4 = Mystery by Gerstrong (unknown color, unknown joystick) # 3 = Mystery by Gerstrong (unknown color, unknown joystick)
TouchscreenKeysTheme=3 TouchscreenKeysTheme=2
# Redefine gamepad keys to SDL keysyms, button order is: # Redefine gamepad keys to SDL keysyms, button order is:
# A B X Y L1 R1 L2 R2 LThumb RThumb # A B X Y L1 R1 L2 R2 LThumb RThumb
@@ -170,10 +170,10 @@ MultiABI=y
AppMinimumRAM=0 AppMinimumRAM=0
# Application version code (integer) # Application version code (integer)
AppVersionCode=06213 AppVersionCode=06214
# Application user-visible version name (string) # 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) # Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y ResetSdlConfigForThisVersion=y
@@ -209,7 +209,7 @@ AppCmdline=''
# Here you may type readme text, which will be shown during startup. Format is: # 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?) # 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 # 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 # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge

2
project/jni/application/teeworlds/src

Submodule project/jni/application/teeworlds/src updated: e2be6d4a7d...34b64249c4

4
todo.txt
View File

@@ -20,8 +20,6 @@ Requested features, might never get implemented
TODO, which will get actually done 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. - 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. - 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: move 3-rd person camera to the side, above shoulder.
- OpenArena: finish Ouya port.
- SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper. - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper.
- UfoAI: huge huge update. - UfoAI: huge huge update.