From f6f1794651c871fee21e6e77bfd73494420742ec Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 13 Jan 2012 22:06:30 +0000 Subject: [PATCH] (svn r23797) [1.1] -Prepare: 1.1.5 --- changelog.txt | 12 ++++++------ known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/os2/installer/make_installer.cmd | 2 +- os/rpm/openttd.spec | 2 +- os/windows/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- src/ai/api/ai_changelog.hpp | 4 ++++ 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/changelog.txt b/changelog.txt index 9c03bb6bc7..9a5aeba178 100644 --- a/changelog.txt +++ b/changelog.txt @@ -75,7 +75,7 @@ 1.1.3-RC1 (2011-09-04) ------------------------------------------------------------------------ - Add: River graphics for the original base set (r22766) -- Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882) +- Fix: [NewGRF] DCxx text references via the text stack are not allowed, but caused crash [FS#4758] (r22882) - Fix: Harden memory allocation (r22881, r22880, r22875) - Fix: Miscalculation of train curve speed limits (r22879) - Fix: Validate image dimensions before loading [CVE-2011-3343] [FS#4747] (r22878, r22877, r22874, r22873) @@ -877,7 +877,7 @@ - Fix: Sorting industries by production was broken for NewGRF industries (r19538) - Fix: Vehicle details window did not resize correctly after refitting a road vehicle to a longer variant [FS#3720] (r19533) - Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water (r19523) -- Fix: Tunnels, bridges and roadstops are build with only one roadtype (r19506) +- Fix: Tunnels, bridges and road stops are build with only one roadtype (r19506) - Fix: Remove same_industry_close setting did not do what it said and caused NewGRF trouble (r19499) - Fix: Keep number padding intact when cloning vehicle names [FS#3710] (r19498) - Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage (r19497) @@ -977,7 +977,7 @@ - Fix: Not all news data was properly freed when starting a new game [FS#3614] (r19105) - Fix: The BeMidi driver was broken [FS#3610] (r19097) - Fix: Crash when one of the items in the news_display group in the config file has no value (r19096) -- Fix: Crash when a baseset has an empty metadata field (r19095) +- Fix: Crash when a base set has an empty metadata field (r19095) - Fix: Possible read/write after free when the client triggered the server to close the connection [FS#3599] (r19072) - Fix: Remove Bidi control characters from the reordered text so they are not drawn [FS#3604] (r19067) - Fix: [NewGRF] Settings that are part of the 'TTDPatch flags' can cause desyncs if they are changed in network games (r19066) @@ -1663,7 +1663,7 @@ - Fix: Add an EngineOverrideManager to give the term 'compatible NewGRF' again some sense and to not crash because of trivial changes [FS#2612] (r15645) - Fix: Closing a network connection twice in the case that sending packets starts failing while disconnecting [FS#2710] (r15644) - Fix: Game crashes when network pools are empty, so always allocate at least one pool block [FS#2712] (r15641) -- Fix: Do not allow more than 64 road vehicles to reserve a slot at a single road stop. 255 + 1 gives trouble, but 64 is even more than the roadstop would be able to handle within the slot timeout time [FS#2707] (r15635) +- Fix: Do not allow more than 64 road vehicles to reserve a slot at a single road stop. 255 + 1 gives trouble, but 64 is even more than the road stop would be able to handle within the slot timeout time [FS#2707] (r15635) - Fix: Kicking/banning a client from the Client list window crashed the server [FS#2705] (r15628) - Fix: UTF8 string handling could cause buffer overruns [FS#2698] (r15626) - Fix: When trying to reserve a self-crossing path the failed reservation was sometimes not cleared completely [FS#2701] (r15619) @@ -2198,7 +2198,7 @@ - Fix: Do entrance-slope-check for every tile of railstations (r11999) - Fix: Possible remote assert by setting bit 6 of p1 for CMD_REMOVE_ROAD [FS#1692] (r11998) - Fix: Update train statusbar when stopping from zero speed [FS#1706] (r11996) -- Fix: Resize station/roadstop/dock/airport construction windows if cargo acceptance list is too long (r11993) +- Fix: Resize station/road stop/dock/airport construction windows if cargo acceptance list is too long (r11993) - Fix: When building two rail stations close to each other (with control) so they looked like one long track trains would see them as one (r11992) - Fix: Resize autoreplace window to fit purchase information text if it is too large (r11989) - Fix: Build system ignored changes to table/control_codes.h which require strgen to be rebuilt (r11986) @@ -2729,7 +2729,7 @@ - Codechange: Change the ordering of the network list, compatible servers just missing grf files are below fully compatible servers, not on the bottom (r8118) - Fix: Return proper error value when unthreaded save fails, prevents server sending 0-sized files (r8171) - Fix: Network client crashes when a server sends a 0-sized savegame [FS#556] (r8167) -- Fix: Several desync fixes (incorrect roadstop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157) +- Fix: Several desync fixes (incorrect road stop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157) - Fix: Some disaster-events fixed: combat chopper shoots from right position, submarine once again moves around (r8140, r8158) - Fix: 'out of sprite memory' warning messages due to incorrect assumption of requested memory for sprites (r8133) - Fix: Buoys are now built and numbered 1..9 not 9..1 [FS#538] (r8123) diff --git a/known-bugs.txt b/known-bugs.txt index 4191a8c6a5..677f9b8f5e 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2011-12-05 -Release version: 1.1.4 +Last updated: 2012-01-14 +Release version: 1.1.5 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 7711ca59fb..1afaf7f612 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.1.5) unstable; urgency=low + + * New upstream release 1.1.5 + + -- Matthijs Kooijman Sat, 14 Jan 2012 00:00:00 +0400 + openttd (1.1.4) unstable; urgency=low * New upstream release 1.1.4 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index d5dd0ac548..e7209db8ab 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.4 +set OPENTTD_VERSION=1.1.5 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index b7af182013..860207263d 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -2,7 +2,7 @@ %define binname openttd -%define srcver 1.1.4 +%define srcver 1.1.5 %if %{dedicated} Name: %{binname}-dedicated diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index d143c7646e..c11c437149 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -1,8 +1,8 @@ # Version numbers to update !define APPV_MAJOR 1 !define APPV_MINOR 1 -!define APPV_MAINT 4 -!define APPV_BUILD 1 +!define APPV_MAINT 5 +!define APPV_BUILD 0 !define APPV_EXTRA "" !define APPNAME "OpenTTD" ; Define application name diff --git a/readme.txt b/readme.txt index cf0bfd2962..b92ff8e380 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2011-12-05 -Release version: 1.1.4 +Last updated: 2012-01-14 +Release version: 1.1.5 ------------------------------------------------------------------------ diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp index be70739ad9..920f04806d 100644 --- a/src/ai/api/ai_changelog.hpp +++ b/src/ai/api/ai_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.1.5 + * + * No changes + * * \b 1.1.4 * * API additions: