diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 258c68dde8..8fda6fd77e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. --> **OS:** [e.g. Windows 10] -**Version:** [e.g. 0.2.3] +**Version:** [e.g. 0.2.4] **Commit/Build:** [e.g. 426e106] diff --git a/appveyor.yml b/appveyor.yml index b703a41a5d..fb4a0eb816 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.2.3.{build} +version: 0.2.4.{build} image: - Visual Studio 2017 cache: diff --git a/debian/changelog b/debian/changelog index 492ba600dc..a6910cb344 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openrct2 (0.2.3-develop-1) unstable; urgency=medium +openrct2 (0.2.4-develop-1) unstable; urgency=medium - * Release 2019-07 (Closes: #XXXXXX) + * Release 2019-10 (Closes: #XXXXXX) -- Michał Janiszewski Sun, 10 Jan 2016 23:41:16 +0100 diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 3c45c4fc19..f37a878440 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,4 +1,4 @@ -0.2.3+ (in development) +0.2.4 (2019-10-28) ------------------------------------------------------------------------ - Feature: [#9285] Remember current group in scenario list window. - Feature: [#9918] Increase image list capacity by about 100k units. diff --git a/distribution/macos/Info.plist b/distribution/macos/Info.plist index ef0188664d..495b9bdfd8 100644 --- a/distribution/macos/Info.plist +++ b/distribution/macos/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.3 + 0.2.4 CFBundleSignature ORCT LSMinimumSystemVersion diff --git a/distribution/readme.txt b/distribution/readme.txt index ef3bb42f6f..2461d53d2f 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2019-07-10 -Release version: 0.2.3 +Last updated: 2019-10-28 +Release version: 0.2.4 ------------------------------------------------------------------------ diff --git a/openrct2.proj b/openrct2.proj index f40db1ec61..9576de9283 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -18,7 +18,7 @@ x64 $(GIT_COMMIT_SHA1.Substring(0, 7)) - 0.2.3 + 0.2.4 -$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT) 16 diff --git a/readme.md b/readme.md index 9d620fcc7e..60fbf56d42 100644 --- a/readme.md +++ b/readme.md @@ -10,8 +10,8 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m ### Build Status | | Windows | Linux / Mac | Download | |-------------|---------|-------------|----------| -| **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.2.3-green.svg)](https://openrct2.org/downloads/master/latest) | -| **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.3+-blue.svg)](https://openrct2.org/downloads/develop/latest) | +| **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.2.4-green.svg)](https://openrct2.org/downloads/master/latest) | +| **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.4+-blue.svg)](https://openrct2.org/downloads/develop/latest) | --- diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index 2e389666e3..deefc6eb68 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion 25 versionCode 2 - versionName '0.2.3' + versionName '0.2.4' externalNativeBuild { cmake { diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index a2efb7985f..d950be3867 100644 --- a/src/openrct2/Version.h +++ b/src/openrct2/Version.h @@ -12,7 +12,7 @@ #include "common.h" #define OPENRCT2_NAME "OpenRCT2" -#define OPENRCT2_VERSION "0.2.3" +#define OPENRCT2_VERSION "0.2.4" #if defined(__amd64__) || defined(_M_AMD64) # define OPENRCT2_ARCHITECTURE "x86-64" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index d175eb0110..f8a7cf0b2d 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -34,7 +34,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "22" +#define NETWORK_STREAM_VERSION "0" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;