diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4151e7208c..71bdb9ba2b 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.0] +**Version:** [e.g. 0.2.1] **Commit/Build:** [e.g. 426e106] diff --git a/.travis.yml b/.travis.yml index bc59a20c5b..bec91611d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ sudo: required dist: trusty env: global: - - OPENRCT2_VERSION="0.2.0" + - OPENRCT2_VERSION="0.2.1" matrix: include: diff --git a/appveyor.yml b/appveyor.yml index a8a0cf2e11..96877baa6f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.2.0.{build} +version: 0.2.1.{build} image: - Visual Studio 2017 cache: diff --git a/debian/changelog b/debian/changelog index f5d047315a..c4c6303508 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openrct2 (0.2.0-develop-1) unstable; urgency=medium +openrct2 (0.2.1-develop-1) unstable; urgency=medium - * Release 2018-06 (Closes: #XXXXXX) + * Release 2018-08 (Closes: #XXXXXX) -- Michał Janiszewski Sun, 10 Jan 2016 23:41:16 +0100 diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e2ecc29ffd..a3fc86b6d1 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,4 +1,4 @@ -0.2.0+ (in development) +0.2.1 (2018-08-26) ------------------------------------------------------------------------ - Feature: [#5993] Ride window prices can now be set via text input. - Feature: [#6998] Guests now wait for passing vehicles before crossing railway tracks. diff --git a/distribution/macos/Info.plist b/distribution/macos/Info.plist index eff08ae713..059dcd252f 100644 --- a/distribution/macos/Info.plist +++ b/distribution/macos/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.0 + 0.2.1 CFBundleSignature ORCT LSMinimumSystemVersion diff --git a/distribution/readme.txt b/distribution/readme.txt index 2c803d5b1a..3f67bf5b68 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2018-06-10 -Release version: 0.2.0 +Last updated: 2018-08-26 +Release version: 0.2.1 ------------------------------------------------------------------------ diff --git a/openrct2.proj b/openrct2.proj index 94ce06f033..8a8e7e2484 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -19,7 +19,7 @@ x64 $(GIT_COMMIT_SHA1.Substring(0, 7)) - 0.2.0 + 0.2.1 -$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT) 16 diff --git a/readme.md b/readme.md index 7d8bc5fca7..3f17e98bfb 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.0-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.0-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.1-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.1-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 43ae08dc3c..a44bf79814 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.0' + versionName '0.2.1' externalNativeBuild { cmake { diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index 2fb0b2da7f..9b98ac59b8 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.0" +#define OPENRCT2_VERSION "0.2.1" #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 b644708fc4..7015e715f4 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -28,7 +28,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 "6" +#define NETWORK_STREAM_VERSION "0" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;