diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 941fb7c480..5424716b63 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,7 +11,7 @@ assignees: '' 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.5] +**Version:** [e.g. 0.2.6] **Commit/Build:** [e.g. 426e106] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 371a6521a2..9fcdd4bdcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ env: OPENRCT2_BUILD_SERVER: GitHub OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }} BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }} - OPENRCT2_VERSION: 0.2.5 + OPENRCT2_VERSION: 0.2.6 jobs: check-code-formatting: name: Check code formatting diff --git a/debian/changelog b/debian/changelog index 51a560d342..843d707b6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openrct2 (0.2.5-develop-1) unstable; urgency=medium +openrct2 (0.2.6-develop-1) unstable; urgency=medium - * Release 2020-03 (Closes: #XXXXXX) + * Release 2020-04 (Closes: #XXXXXX) -- MichaƂ Janiszewski Sun, 10 Jan 2016 23:41:16 +0100 diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e0a3481ca1..db279f00a1 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,4 +1,4 @@ -0.2.5+ (in development) +0.2.6 (2020-04-17) ------------------------------------------------------------------------ - Feature: [#10925] Show hovered values on finance charts. - Feature: [#11013] Ctrl+C copies input dialog text to clipboard. diff --git a/distribution/macos/Info.plist b/distribution/macos/Info.plist index 576153541a..2c77c2a1eb 100644 --- a/distribution/macos/Info.plist +++ b/distribution/macos/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.5 + 0.2.6 CFBundleSignature ORCT LSMinimumSystemVersion diff --git a/distribution/readme.txt b/distribution/readme.txt index ac9c61d7f6..63d49b44a8 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2020-03-24 -Release version: 0.2.4 +Last updated: 2020-04-17 +Release version: 0.2.6 ------------------------------------------------------------------------ diff --git a/readme.md b/readme.md index 18228d4e79..f6f999a91b 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m ### Download | Latest release | Latest development build | |----------------|--------------------------| -| [![OpenRCT2.org](https://img.shields.io/badge/master-v0.2.5-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.5+-blue.svg)](https://openrct2.org/downloads/develop/latest) | +| [![OpenRCT2.org](https://img.shields.io/badge/master-v0.2.6-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.6+-blue.svg)](https://openrct2.org/downloads/develop/latest) | --- diff --git a/scripts/setenv b/scripts/setenv index d7ab63baca..8a0a0af612 100755 --- a/scripts/setenv +++ b/scripts/setenv @@ -4,7 +4,7 @@ # It should be dot sourced into your environment if [[ "$GITHUB_ACTIONS" != "true" ]]; then export OPENRCT2_BUILD_SERVER=$(hostname) - export OPENRCT2_VERSION=0.2.5 + export OPENRCT2_VERSION=0.2.6 GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD) GITHUB_SHA=$(git rev-parse HEAD) fi diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index edd1a82e29..29533cf531 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion 28 versionCode 2 - versionName '0.2.5' + versionName '0.2.6' externalNativeBuild { cmake { diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index a888cf1091..c908744a7b 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.5" +#define OPENRCT2_VERSION "0.2.6" #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 dcf9865c23..eb373535d2 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 "16" +#define NETWORK_STREAM_VERSION "0" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;