diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 312485416..c42d589ae 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -18,7 +18,7 @@ AppVersionName="1.4.0.30" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.0-2.zip/download^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.27.cfg^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Internationalization files|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip/download" +AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.0-2.zip/download^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Internationalization files|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip/download" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg similarity index 95% rename from project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg rename to project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg index cc4467b06..6b9a85504 100644 --- a/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg +++ b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg @@ -18,4 +18,4 @@ min_step_size = 40 [gui] left_mouse_btn_scrolling = true osk_activation = disabled -auto_scrolling = 2 +auto_scrolling = 0 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 7748f7cbf..1d82f5794 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 7748f7cbf1bc3c26e0fcb9b04ff20966d00aa6a0 +Subproject commit 1d82f579450fac1aa1807419b63de07d5fd8e487 diff --git a/todo.txt b/todo.txt index 8b9e1eece..cd1bf4b1b 100644 --- a/todo.txt +++ b/todo.txt @@ -19,14 +19,10 @@ TODO, which will get actually done - OpenTTD: no sounds with music on. -- OpenTTD: Fix multiplayer lobby dialog. - - OpenTTD: Two-finger scrolling. - OpenTTD: 'build waypoint' button tries to build a train station. -- OpenTTD: Add 'cheat' command to console. - - OpenTTD: Split top toolbar into left/right toolbars. - Debian noroot: Audio support.