From fb51a1835761a9846ca428ed8eb837aacee15c59 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Fri, 6 Sep 2019 16:31:55 +0200 Subject: [PATCH] Update: Changelog for 1.9.3-RC1 and prepare for release --- changelog.txt | 14 ++++++++++++++ known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/os2/installer/make_installer.cmd | 2 +- os/rpm/openttd.spec | 4 ++-- os/windows/installer/install.nsi | 4 ++-- src/os/windows/ottdres.rc.in | 4 ++-- src/rev.cpp.in | 2 +- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1beeeaecdb..2e00def700 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,17 @@ +1.9.3-RC1 (2019-09-07) +------------------------------------------------------------------------ +- Add: Can now click industries to make orders to their neutral station (e.g. oil rig) (#7709) +- Fix #7644: [OSX] Poor framerate on certain systems (#7721) +- Fix #7702: Highscore screen UI scaling (#7714) +- Fix #7704: [OSX] Handle malformed UTF8 strings, leading to crashes in server browser (#7705) +- Fix #7188: [AI] Possible crash when reloading an AI in multiplayer games (#7701, #7725) +- Fix: RemoveAirport function now returns 'Aircraft in the way' error message when occupied (#7690) +- Fix: Spelling in running costs setting help text (#7686) +- Fix #7655: 'Decrease' buttons in cheat window not working properly with UI scaling (#7669) +- Fix: [GS] Could not create elements on Storybook pages with ID > 255 (#7657) +- Fix #7626: Allow building road stops over town-owned one-way roads, instead of crashing (#7627) + + 1.9.2 (2019-07-07) ------------------------------------------------------------------------ - Change: Set default setting in server browser of "Advertised" to "Yes" (#7568) diff --git a/known-bugs.txt b/known-bugs.txt index 2d96c7d440..598fbcda38 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2019-07-07 -Release version: 1.9.2 +Last updated: 2019-09-07 +Release version: 1.9.3-RC1 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 246d5ed29d..f2ff4169a0 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.9.3~RC1-0) unstable; urgency=low + + * New upstream release 1.9.3-RC1 + + -- OpenTTD Sat, 07 Sep 2019 23:30:00 +0200 + openttd (1.9.2-0) unstable; urgency=low * New upstream release 1.9.2 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 9c8cbd65ea..07ee359dd8 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.9.2 +set OPENTTD_VERSION=1.9.3 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=1.2.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 1c0795c781..98dfacf572 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -17,9 +17,9 @@ # Name: openttd -Version: 1.9.2 +Version: 1.9.3-RC1 Release: 0 -%define srcver 1.9.2 +%define srcver 1.9.3-RC1 Summary: An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe License: GPL-2.0 Group: Amusements/Games/Strategy/Other diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 1b07bab442..8bb35e3c06 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -1,9 +1,9 @@ # Version numbers to update !define APPV_MAJOR 1 !define APPV_MINOR 9 -!define APPV_MAINT 2 +!define APPV_MAINT 3 !define APPV_BUILD 0 -!define APPV_EXTRA "" +!define APPV_EXTRA "-RC1" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index 25f0bfd45a..b7208bc729 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -79,8 +79,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,2,!!ISODATE!! - PRODUCTVERSION 1,9,2,!!ISODATE!! + FILEVERSION 1,9,3,!!ISODATE!! + PRODUCTVERSION 1,9,3,!!ISODATE!! FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 0fb8db7aaf..1771a52c67 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -82,7 +82,7 @@ const byte _openttd_revision_tagged = !!ISTAG!!; * final release will always have a lower version number than the released * version, thus making comparisons on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 9 << 24 | 2 << 20 | !!ISSTABLETAG!! << 19 | 28004; +const uint32 _openttd_newgrf_version = 1 << 28 | 9 << 24 | 3 << 20 | !!ISSTABLETAG!! << 19 | 28004; #ifdef __MORPHOS__ /**