Merge branch 'master' into develop

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

.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.3.2
+  OPENRCT2_VERSION: 0.3.3
 jobs:
   lint-commit:
     name: Lint Commit Message

debian/changelog

@@ -1,8 +1,8 @@
-openrct2 (0.3.2-develop-1) unstable; urgency=medium
+openrct2 (0.3.3-develop-1) unstable; urgency=medium
 
   * Nightly develop build.
 
-openrct2 (0.3.2) stable; urgency=medium
+openrct2 (0.3.3) stable; urgency=medium
 
   * Feature: [#12110] Add Hybrid Coaster (Rocky Mountain Construction I-Box) track type.
   * Feature: [#12999] .sea (RCT Classic) scenarios are now listed in the “New Scenario” dialog.

distribution/changelog.txt

@@ -1,4 +1,4 @@
-0.3.2+ (in development)
+0.3.3 (2021-03-13)
 ------------------------------------------------------------------------
 - Feature: [#6677] Add Discord RPC to macOS builds.
 - Feature: [#6844] Enhanced track designer with ability to add/remove scenery and footpaths.

distribution/linux/openrct2.appdata.xml

@@ -66,6 +66,9 @@
     <content_attribute id="money-gambling">none</content_attribute>
   </content_rating>
   <releases>
+      <release version="0.3.3" date="2021-03-13">
+        <url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.3</url>
+      </release>
       <release version="0.3.2" date="2020-11-01">
         <url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.2</url>
       </release>

distribution/macos/Info.plist

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

distribution/readme.txt

@@ -1,5 +1,5 @@
-Last updated:    2020-11-01
-Release version: 0.3.2
+Last updated:    2021-03-13
+Release version: 0.3.3
 ------------------------------------------------------------------------
 
 

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.3.2-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.2+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
+| [![OpenRCT2.org](https://img.shields.io/badge/master-v0.3.3-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.3+-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.3.2
+    export OPENRCT2_VERSION=0.3.3
     GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD)
     GITHUB_SHA=$(git rev-parse HEAD)
 fi

src/openrct2-android/app/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion 28
 
         versionCode 2
-        versionName '0.3.2'
+        versionName '0.3.3'
 
         externalNativeBuild {
             cmake {

src/openrct2/Version.h

@@ -14,7 +14,7 @@
 #include <string>
 
 #define OPENRCT2_NAME "OpenRCT2"
-#define OPENRCT2_VERSION "0.3.2"
+#define OPENRCT2_VERSION "0.3.3"
 
 #if defined(__amd64__) || defined(_M_AMD64)
 #    define OPENRCT2_ARCHITECTURE "x86-64"

src/openrct2/network/NetworkBase.cpp

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