Merge branch 'master' into develop

.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.4]
+**Version:** [e.g. 0.2.5]
 **Commit/Build:** [e.g. 426e106]
 
 <!-- Explanation of the issue -->

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 env:
   OPENRCT2_BUILD_SERVER: GitHub
   OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }}
-  OPENRCT2_VERSION: 0.2.4
+  OPENRCT2_VERSION: 0.2.5
 jobs:
   check-code-formatting:
     name: Check code formatting

debian/changelog

@@ -1,5 +1,5 @@
-openrct2 (0.2.4-develop-1) unstable; urgency=medium
+openrct2 (0.2.5-develop-1) unstable; urgency=medium
 
-  * Release 2019-10 (Closes: #XXXXXX)
+  * Release 2020-03 (Closes: #XXXXXX)
 
  -- Michał Janiszewski <janisozaur+openrct2@gmail.com>  Sun, 10 Jan 2016 23:41:16 +0100

distribution/changelog.txt

@@ -1,4 +1,4 @@
-0.2.4+ (in development)
+0.2.5 (2020-03-24)
 ------------------------------------------------------------------------
 - Feature: [#3154] Use a random title sequence each time it is shown.
 - Feature: [#6553] Android version now runs in full screen.

distribution/macos/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.4</string>
+	<string>0.2.5</string>
 	<key>CFBundleSignature</key>
 	<string>ORCT</string>
 	<key>LSMinimumSystemVersion</key>

distribution/readme.txt

@@ -1,4 +1,4 @@
-Last updated:    2019-10-28
+Last updated:    2020-03-24
 Release version: 0.2.4
 ------------------------------------------------------------------------
 

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.4-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.2.4+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
+| [![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) |
 
 ---
 

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.4
+    export OPENRCT2_VERSION=0.2.5
     GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD)
     GITHUB_SHA=$(git rev-parse HEAD)
 fi

src/openrct2/Version.h

@@ -12,7 +12,7 @@
 #include "common.h"
 
 #define OPENRCT2_NAME "OpenRCT2"
-#define OPENRCT2_VERSION "0.2.4"
+#define OPENRCT2_VERSION "0.2.5"
 
 #if defined(__amd64__) || defined(_M_AMD64)
 #    define OPENRCT2_ARCHITECTURE "x86-64"

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 "24"
+#define NETWORK_STREAM_VERSION "0"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;