diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5aa47faa23..1626ca3408 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.1] +**Version:** [e.g. 0.2.2] **Commit/Build:** [e.g. 426e106] diff --git a/.travis.yml b/.travis.yml index c47578c7df..92b8ca0dab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ sudo: required dist: trusty env: global: - - OPENRCT2_VERSION="0.2.1" + - OPENRCT2_VERSION="0.2.2" # CURL timeouts in [seconds] (https://ec.haxx.se/usingcurl-timeouts.html) - CURL_MAX_TIME=300 - CURL_CONNECT_TIMEOUT=5 diff --git a/appveyor.yml b/appveyor.yml index 96877baa6f..5313baf79f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.2.1.{build} +version: 0.2.2.{build} image: - Visual Studio 2017 cache: diff --git a/debian/changelog b/debian/changelog index c4c6303508..664a7a3582 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openrct2 (0.2.1-develop-1) unstable; urgency=medium +openrct2 (0.2.2-develop-1) unstable; urgency=medium - * Release 2018-08 (Closes: #XXXXXX) + * Release 2019-03 (Closes: #XXXXXX) -- Michał Janiszewski Sun, 10 Jan 2016 23:41:16 +0100 diff --git a/distribution/changelog.txt b/distribution/changelog.txt index ece7e42a48..71b0695a56 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,4 +1,4 @@ -0.2.1+ (in development) +0.2.2 (2019-03-13) ------------------------------------------------------------------------ - Feature: [#4418] Allow steep slopes on the side-friction roller coaster. - Feature: [#7726] Add shortcut to advance one tick. diff --git a/distribution/macos/Info.plist b/distribution/macos/Info.plist index 059dcd252f..38af077c0f 100644 --- a/distribution/macos/Info.plist +++ b/distribution/macos/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.1 + 0.2.2 CFBundleSignature ORCT LSMinimumSystemVersion diff --git a/distribution/readme.txt b/distribution/readme.txt index 3f67bf5b68..d711bad307 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2018-08-26 -Release version: 0.2.1 +Last updated: 2019-03-13 +Release version: 0.2.2 ------------------------------------------------------------------------ @@ -141,15 +141,17 @@ OpenRCT2 is licensed under the GNU General Public Licence version 3.0. For the complete licence text, see the file 'licence.txt'. This licence applies to all files in this distribution, except as noted below. -Jansson | MIT licence. -libcURL | MIT (or Modified BSD-style) licence. -libicu | Unicode licence. -libspeex | BSD-style licence. -libpng | libpng licence. -libzip | BSD 3 clause licence. -OpenSSL | OpenSSL Licence -SDL2 | zlib licence. -zlib | zlib licence. +Jansson | MIT licence. +libcURL | MIT (or Modified BSD-style) licence. +libicu | Unicode licence. +libspeex | BSD-style licence. +libpng | libpng licence. +libzip | BSD 3 clause licence. +OpenSSL | OpenSSL Licence +SDL2 | zlib licence. +zlib | zlib licence. +Google Test | BSD 3 clause licence. +Google Benchmark | Apache 2.0 licence. Licences for sub-libraries used by the above may vary. For more information, visit the libraries' respective official websites. diff --git a/openrct2.proj b/openrct2.proj index 65481249c7..af9d95b558 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -18,7 +18,7 @@ x64 $(GIT_COMMIT_SHA1.Substring(0, 7)) - 0.2.1 + 0.2.2 -$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT) 16 diff --git a/readme.md b/readme.md index 3292c06a18..67314da372 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.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) | +| **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.2-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.2+-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 e841b8c646..30dc262a4d 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.1' + versionName '0.2.2' externalNativeBuild { cmake { diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index eaa1ac551b..29da424899 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.1" +#define OPENRCT2_VERSION "0.2.2" #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 2653afa75a..95cd5e38b4 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,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 "56" +#define NETWORK_STREAM_VERSION "0" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;