From 3b184dc44fe21c421c707d1504e7e4aabe892dde Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 27 May 2014 22:16:01 +0300 Subject: [PATCH] Updated OpenTTD --- project/jni/application/openttd/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openttd/src | 2 +- todo.txt | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 78e8c2e73..312485416 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -18,17 +18,17 @@ 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-1.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.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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg .openttd/openttd.cfg" +DeleteFilesOnUpgrade="" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ -ReadmeText='If this update runs slowly - install OpenTTD-lowmem,\\\\nit is tuned for older devices, and uses simpler 8bpp graphics\\\\n^button:Install OpenTTD-lowmem:https://play.google.com/store/apps/details?id=org.openttd.sdl.lowmem' +ReadmeText='' # libSDL version to use (1.2/1.3/2.0) LibSdlVersion=1.2 @@ -234,7 +234,7 @@ AppCmdline='openttd -d 1 -b 16bpp-simple' # 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 -MinimumScreenSize=s +MinimumScreenSize=m # Your AdMob Publisher ID, (n) if you don't want advertisements AdmobPublisherId=n diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index fed40b76f..7748f7cbf 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit fed40b76ff3533462aaaff943ee9d5e687d7e714 +Subproject commit 7748f7cbf1bc3c26e0fcb9b04ff20966d00aa6a0 diff --git a/todo.txt b/todo.txt index 285d25a26..8b9e1eece 100644 --- a/todo.txt +++ b/todo.txt @@ -27,6 +27,8 @@ TODO, which will get actually done - OpenTTD: Add 'cheat' command to console. +- OpenTTD: Split top toolbar into left/right toolbars. + - Debian noroot: Audio support. - UQM: use gyroscope to steer the ship, search button for starmap.