Merge branch 'master' into develop

This commit is contained in:
Aaron van Geffen 2020-08-15 22:16:12 +02:00
commit e0a6823701
12 changed files with 16 additions and 13 deletions

View File

@ -11,7 +11,7 @@ assignees: ''
Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
--> -->
**OS:** [e.g. Windows 10] **OS:** [e.g. Windows 10]
**Version:** [e.g. 0.2.6] **Version:** [e.g. 0.3.0]
**Commit/Build:** [e.g. 426e106] **Commit/Build:** [e.g. 426e106]
<!-- Explanation of the issue --> <!-- Explanation of the issue -->

View File

@ -4,7 +4,7 @@ env:
OPENRCT2_BUILD_SERVER: GitHub OPENRCT2_BUILD_SERVER: GitHub
OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }} OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }}
BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }} BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }}
OPENRCT2_VERSION: 0.2.6 OPENRCT2_VERSION: 0.3.0
jobs: jobs:
lint-commit: lint-commit:
name: Lint Commit Message name: Lint Commit Message

4
debian/changelog vendored
View File

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

View File

@ -1,4 +1,4 @@
0.2.6+ (in development) 0.3.0 (2020-08-15)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Feature: [#7648] "Enable all drawable track pieces" now enables more pieces for the Twister, Vertical and Air Powered Vertical coasters. - Feature: [#7648] "Enable all drawable track pieces" now enables more pieces for the Twister, Vertical and Air Powered Vertical coasters.
- Feature: [#9029] Open doors with the tile inspector. - Feature: [#9029] Open doors with the tile inspector.

View File

@ -64,6 +64,9 @@
<content_attribute id="money-gambling">none</content_attribute> <content_attribute id="money-gambling">none</content_attribute>
</content_rating> </content_rating>
<releases> <releases>
<release version="0.3.0" date="2020-08-15">
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.0</url>
</release>
<release version="0.2.6" date="2020-04-17"> <release version="0.2.6" date="2020-04-17">
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.2.6</url> <url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.2.6</url>
</release> </release>

View File

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

View File

@ -1,5 +1,5 @@
Last updated: 2020-04-17 Last updated: 2020-08-15
Release version: 0.2.6 Release version: 0.3.0
------------------------------------------------------------------------ ------------------------------------------------------------------------

View File

@ -10,7 +10,7 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m
### Download ### Download
| Latest release | Latest development build | | Latest release | Latest development build |
|----------------|--------------------------| |----------------|--------------------------|
| [![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) | | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.3.0-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.0+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
--- ---

View File

@ -4,7 +4,7 @@
# It should be dot sourced into your environment # It should be dot sourced into your environment
if [[ "$GITHUB_ACTIONS" != "true" ]]; then if [[ "$GITHUB_ACTIONS" != "true" ]]; then
export OPENRCT2_BUILD_SERVER=$(hostname) export OPENRCT2_BUILD_SERVER=$(hostname)
export OPENRCT2_VERSION=0.2.6 export OPENRCT2_VERSION=0.3.0
GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD) GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD)
GITHUB_SHA=$(git rev-parse HEAD) GITHUB_SHA=$(git rev-parse HEAD)
fi fi

View File

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

View File

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

View File

@ -33,7 +33,7 @@
// This string specifies which version of network stream current build uses. // This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "27" #define NETWORK_STREAM_VERSION "0"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr; static Peep* _pickup_peep = nullptr;