mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'master' into develop
This commit is contained in:
commit
219d082bd2
|
@ -7,7 +7,7 @@ env:
|
|||
OPENRCT2_BUILD_SERVER: GitHub
|
||||
OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }}
|
||||
BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }}
|
||||
OPENRCT2_VERSION: 0.3.5
|
||||
OPENRCT2_VERSION: 0.3.5.1
|
||||
jobs:
|
||||
lint-commit:
|
||||
name: Lint Commit Message
|
||||
|
|
|
@ -1,7 +1,20 @@
|
|||
openrct2 (0.3.5-develop-1) unstable; urgency=medium
|
||||
openrct2 (0.3.5.1-develop-1) unstable; urgency=medium
|
||||
|
||||
* Nightly develop build.
|
||||
|
||||
openrct2 (0.3.5.1) stable; urgency=medium
|
||||
|
||||
* Improved: [#12825, #12869] The Tile Inspector window’s layout has been tweaked slightly.
|
||||
* Change: [#15899] Weird bonus for path 0 - likely intended as a queue bonus (original bug).
|
||||
* Fix: [#15138] Sometimes small scenery stays when building through it.
|
||||
* Fix: [#15620] Placing track designs at locations blocked by anything results in wrong error message.
|
||||
* Fix: [#15843] Tile Inspector can be resized too small.
|
||||
* Fix: [#15844] Tile Inspector has inconsistent text colours.
|
||||
* Fix: [#15878] Crash when opening a ride window for a corrupted vehicle.
|
||||
* Fix: [#15908] Crash when track elements have no ride assigned.
|
||||
* Fix: [#15919] Research status incorrectly considered for scenery when in editor modes.
|
||||
* Fix: [#15938] Track designs of some ride types are incorrectly exported to TD6.
|
||||
|
||||
openrct2 (0.3.5) stable; urgency=medium
|
||||
|
||||
* Feature: [#3868] Initial support for using TTF in OpenGL mode (still contains bugs).
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
0.3.5+ (in development)
|
||||
0.3.5.1 (2021-11-21)
|
||||
------------------------------------------------------------------------
|
||||
- Improved: [#12825, #12869] The Tile Inspector window’s layout has been tweaked slightly.
|
||||
- Change: [#15899] Weird bonus for path 0 - likely intended as a queue bonus (original bug).
|
||||
|
|
|
@ -66,6 +66,9 @@
|
|||
<content_attribute id="money-gambling">none</content_attribute>
|
||||
</content_rating>
|
||||
<releases>
|
||||
<release version="0.3.5.1" date="2021-11-21">
|
||||
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.5.1</url>
|
||||
</release>
|
||||
<release version="0.3.5" date="2021-11-06">
|
||||
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.5</url>
|
||||
</release>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.3.5</string>
|
||||
<string>0.3.5.1</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>ORCT</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Last updated: 2021-11-06
|
||||
Release version: 0.3.5
|
||||
Last updated: 2021-11-21
|
||||
Release version: 0.3.5.1
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
|
|
@ -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.5-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.5+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
|
||||
| [![OpenRCT2.org](https://img.shields.io/badge/master-v0.3.5.1-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.5.1-blue.svg)](https://openrct2.org/downloads/develop/latest) |
|
||||
|
||||
---
|
||||
|
||||
|
|
|
@ -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.5
|
||||
export OPENRCT2_VERSION=0.3.5.1
|
||||
GITHUB_REF=$(git rev-parse --symbolic-full-name HEAD)
|
||||
GITHUB_SHA=$(git rev-parse HEAD)
|
||||
fi
|
||||
|
|
|
@ -10,7 +10,7 @@ android {
|
|||
targetSdkVersion 28
|
||||
|
||||
versionCode 2
|
||||
versionName '0.3.5'
|
||||
versionName '0.3.5.1'
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <string>
|
||||
|
||||
#define OPENRCT2_NAME "OpenRCT2"
|
||||
#define OPENRCT2_VERSION "0.3.5"
|
||||
#define OPENRCT2_VERSION "0.3.5.1"
|
||||
|
||||
#if defined(__amd64__) || defined(_M_AMD64)
|
||||
# define OPENRCT2_ARCHITECTURE "x86-64"
|
||||
|
|
|
@ -38,7 +38,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 "1"
|
||||
#define NETWORK_STREAM_VERSION "0"
|
||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||
|
||||
static Peep* _pickup_peep = nullptr;
|
||||
|
|
Loading…
Reference in New Issue