From c1c35b5ac5a46dba2a70a919f055509a36a1ff85 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 18 Mar 2011 20:56:54 +0000 Subject: [PATCH] (svn r22261) [1.1] -Prepare: for 1.1.0-RC3 --- changelog.txt | 15 ++++++++++++++- known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/os2/installer/make_installer.cmd | 2 +- os/windows/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- src/lang/esperanto.txt | 1 + src/lang/french.txt | 1 - src/lang/greek.txt | 3 ++- src/lang/italian.txt | 1 + src/lang/slovak.txt | 1 + 11 files changed, 32 insertions(+), 10 deletions(-) diff --git a/changelog.txt b/changelog.txt index abd19cf1be..07836fd9cb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,16 @@ +1.1.0-RC3 (2011-03-18) +------------------------------------------------------------------------ +- Fix: New game settings were applied to early when starting a game via a heightmap. [FS#4557] (r22259) +- Fix: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting [FS#4546] (r22249, r22248, r22247, r22246, r22245, r22244, r22243, r22242, r22241, r22236, r22228, r22227, r22226) +- Fix: [NewGRF] Object variable 0x48 was not available in callback 0x15C (r22231) +- Fix: Compilation when compiling with --disable-ai (r22222) +- Fix: When downloading a file via HTTP failed mid-way and OpenTTD fell back to the old system the partial downloaded amount would be counted twice [FS#4543] (r22208) +- Fix: The 'center' (for movement) of vehicles is (currently still) always at 4/8th original vehicle length from the front, so trains should stop at the same location regardless of the length of the front engine [FS#4545] (r22206) +- Fix: Make the base costs for building and demolishing NewObjects also local to the individual NewGRFs (r22204) +- Fix: Removing a station order could stop when removing first automatic order (r22200) +- Fix: Invalidate the object build window when using the date cheat (r22193) + + 1.1.0-RC2 (2011-03-04) ------------------------------------------------------------------------ - Fix: Following a vehicle with a very high VehicleID was impossible (r22181) @@ -98,7 +111,7 @@ - Fix: The town window would not be invalidated in the scenario editor if the ground changed and thus the required cargos for town growth [FS#4554] (r21929) - Fix: Converting an expensive rail type to a cheap one could give more money than removing and rebuilding cost (r21919) - Fix: Languages improperly sorted in the 'start server' window [FS#4443] (r21918) -- Fix: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to 'fail'. Make sure that the minimum speed always overrules the maximum speed [FS#4442] (r21916) +- Fix: The minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to 'fail'. Make sure that the minimum speed always overrules the maximum speed [FS#4442] (r21916) - Fix: Include the capacity of non-refittable vehicles in the refitted-capacity, if their cargo matches (r21904) - Fix: Do not count articulated parts when passing the number of vehicles to refit to the command. That may exceed 8 bits (r21902) - Fix: [NoAI] Hide automatic orders from AIs as they have no way of dealing with them (r21900) diff --git a/known-bugs.txt b/known-bugs.txt index 7a8b1a75ef..546911f777 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2011-03-04 -Release version: 1.1.0-RC2 +Last updated: 2011-03-18 +Release version: 1.1.0-RC3 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 07fdaa6cf2..8e2cd6e16d 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.1.0~RC3) unstable; urgency=low + + * New upstream release 1.1.0-RC3 + + -- Matthijs Kooijman Fri, 18 Mar 2011 22:00:00 +0100 + openttd (1.1.0~RC2) unstable; urgency=low * New upstream release 1.1.0-RC2 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 5651a18bc7..93decd5a60 100644 --- a/os/os2/installer/make_installer.cmd +++ b/os/os2/installer/make_installer.cmd @@ -1,6 +1,6 @@ @echo off -set OPENTTD_VERSION=1.1.0-RC2 +set OPENTTD_VERSION=1.1.0-RC3 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 338307280c..5dce8985f9 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 1 !define APPV_MAINT 0 -!define APPV_BUILD 6 -!define APPV_EXTRA "-RC2" +!define APPV_BUILD 7 +!define APPV_EXTRA "-RC3" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/readme.txt b/readme.txt index d4c7b6e9db..bdcf39fef8 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2011-03-04 -Release version: 1.1.0-RC2 +Last updated: 2011-03-18 +Release version: 1.1.0-RC3 ------------------------------------------------------------------------ diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 6dcc29d286..16b36c65ff 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1339,6 +1339,7 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Trajnoj STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Urboj STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Industrioj + STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Padtrovilo por trajnoj: {ORANGE}{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF :NPF STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Rekomendite) diff --git a/src/lang/french.txt b/src/lang/french.txt index 127d001904..3b11316552 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1076,7 +1076,6 @@ STR_ECONOMY_FLUCTUATING :Fluctuant STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS :À la fin de la ligne et aux gares STR_REVERSE_AT_END_OF_LINE_ONLY :À la fin de la ligne seulement - STR_DISASTERS_OFF :Désactivé STR_DISASTERS_ON :Activé diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 51730a1785..3dd938caa9 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1391,7 +1391,6 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID :Πλέγμα 2x STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID :Πλέγμα 3x3 STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM :τυχαίο STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :{LTBLUE}Οι πόλεις επιτρέπεται να χτίσουν δρόμους: {ORANGE}{STRING} -STR_CONFIG_SETTING_STATUSBAR_POS :{LTBLUE}Θέση της μπάρας κατάστασης: {ORANGE}{STRING} STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :{LTBLUE}Οι πόλεις επιτρέπουν το χτίσιμο ισοπέδων διασταυρώσεων: {ORANGE}{STRING} STR_CONFIG_SETTING_NOISE_LEVEL :{LTBLUE}Επιτρεπεται η πόλη να ελέγχει το επίπεδο θορύβου των αεροδρομίων: {ORANGE}{STRING} STR_CONFIG_SETTING_TOWN_FOUNDING :{LTBLUE}Ιδρύση πολέων στο παιχνίδι: {ORANGE}{STRING} @@ -1405,6 +1404,7 @@ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :μόνο σε STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :παντού STR_CONFIG_SETTING_TOOLBAR_POS :{LTBLUE}Θέση κύριας εργαλειοθήκης: {ORANGE}{STRING} +STR_CONFIG_SETTING_STATUSBAR_POS :{LTBLUE}Θέση της μπάρας κατάστασης: {ORANGE}{STRING} STR_CONFIG_SETTING_TOOLBAR_POS_LEFT :Αριστερά STR_CONFIG_SETTING_TOOLBAR_POS_CENTER :Κέντρο STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT :Δεξιά @@ -1444,6 +1444,7 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Τρέ STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Πόλεις STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Βιομηχανίες + STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Μέθοδος δρομολόγησης για τρένα: {ORANGE}{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF :NPF STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Συνίσταται) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 8b62395b23..f6c26dc8b5 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1090,6 +1090,7 @@ STR_WARNING_DIFFICULTY_TO_CUSTOM :{WHITE}Questa a # Advanced settings window STR_CONFIG_SETTING_CAPTION :{WHITE}Impostazioni avanzate +STR_CONFIG_SETTING_OFF :No STR_CONFIG_SETTING_OFF.ms :No STR_CONFIG_SETTING_OFF.mp :No STR_CONFIG_SETTING_OFF.fs :No diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 38558f3265..74c4eececa 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1419,6 +1419,7 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Vlaky STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Mestá STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Priemysel + STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Algoritmus hľadania cesty pre vlaky: {ORANGE}{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF :NPF STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(odporučený)