diff --git a/bugs.txt b/bugs.txt index dfd0761da..78766595e 100644 --- a/bugs.txt +++ b/bugs.txt @@ -28,14 +28,6 @@ Requested features, might never get implemented, see todo.txt for features that - 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. -- GIMP: x86 architecture support. - -- GIMP: File open dialog shows error message when loading preview for JPG file. - -- GIMP: Ctrl/Alt/Shift toggles in the taskbar. - -- UfoAI: huge huge update. - - OpenArena: chat text input should be faster. - OpenArena: Shift and Ctrl keys on USB keyboard do not work for text input. diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg index 0a333ed4a..ab7289185 100644 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD lowmem" AppFullName=org.openttd.sdl.lowmem # Application version code (integer) -AppVersionCode=14028 +AppVersionCode=14029 # Application user-visible version name (string) -AppVersionName="1.4.0.28" +AppVersionName="1.4.0.29" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,7 +18,7 @@ AppVersionName="1.4.0.28" # 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.zip/download^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.27.cfg" +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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 73b36ed09..578f2bcd7 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=14028 +AppVersionCode=14029 # Application user-visible version name (string) -AppVersionName="1.4.0.28" +AppVersionName="1.4.0.29" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,7 +18,7 @@ AppVersionName="1.4.0.28" # 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.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-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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 19d76ddbb..fed40b76f 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 19d76ddbbd21bde7c8e3af43a17e8c1059836e91 +Subproject commit fed40b76ff3533462aaaff943ee9d5e687d7e714 diff --git a/todo.txt b/todo.txt index 0874d2c14..61cabaed3 100644 --- a/todo.txt +++ b/todo.txt @@ -17,8 +17,4 @@ TODO, which will get actually done - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper, add gamepad support, fix zoom in settings. -- OpenTTD: resize in-game NewGRF window. - -- OpenTTD: scroll map by touching edges. - -- OpenTTD: fix game version mismatch. +- GIMP: x86 architecture support.