diff --git a/changelog.txt b/changelog.txt index e005b23302..188887bc96 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,20 @@ +1.2.0-RC2 (2012-03-04) +------------------------------------------------------------------------ +- Fix: [Script] AI used in names in API for GSOrder [FS#5088] (r24006) +- Fix: Improve rounding when converting display speeds to internal speeds [FS#5079] (r23995) +- Fix: Also reset the font glyph cache when switching blitters (r23992, r23987) +- Fix: [NewGRF] Also display the cargo subtype for vehicles which have no capacity, but a subtype [FS#5076] (r23991) +- Fix: Zero the offsets of disabled zoomlevels, so they do not influence offset calculations (r23989) +- Fix: Invalid reads when scaling an odd-sized sprite smaller (r23986) +- Fix: Inconsistent quit/abandon/exit game/scenario/editor strings [FS#5074] (r23985) +- Fix: Fix the order of lights on the helipad [FS#5082] (r23984) +- Fix: Tarred heightmaps would not be found [FS#5083] (r23983) +- Fix: Do not load a game during UpdateWindows as that might trigger changing the blitter which triggers re-entrant locking (r23980, r23977) +- Fix: [SDL] Palette update was done too late making switching from 8bpp -> 32bpp look ugly (r23978) +- Fix: Sprites of different zoom levels were not always padded correctly to a common size (r23976) +- Fix: Also save the maximum travel speed for the current vehicle order (r23973) + + 1.2.0-RC1 (2012-02-19) ------------------------------------------------------------------------ - Feature: [NewGRF] Customisable tunnel portals for rail types (r23952) diff --git a/known-bugs.txt b/known-bugs.txt index 45649e0720..1313ce7bc0 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2012-02-19 -Release version: 1.2.0-RC1 +Last updated: 2012-03-04 +Release version: 1.2.0-RC2 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index bac4eb08a1..2088e47723 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.2.0~RC2) unstable; urgency=low + + * New upstream release 1.2.0-RC2 + + -- Matthijs Kooijman Sun, 04 Mar 2012 18:00:00 +0100 + openttd (1.2.0~RC1) unstable; urgency=low * New upstream release 1.2.0-RC1 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index f102a14ab9..606a505a42 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.2.0-RC1 +set OPENTTD_VERSION=1.2.0-RC2 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=1.2.0 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 26fafde121..490d0ba737 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 2 !define APPV_MAINT 0 -!define APPV_BUILD 4 -!define APPV_EXTRA "-RC1" +!define APPV_BUILD 5 +!define APPV_EXTRA "-RC2" !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 2d6cfcf776..975b46330b 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2012-02-19 -Release version: 1.2.0-RC1 +Last updated: 2012-03-04 +Release version: 1.2.0-RC2 ------------------------------------------------------------------------