mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'master' into develop
This commit is contained in:
commit
b77da4c364
|
@ -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.3.4]
|
**Version:** [e.g. 0.3.4.1]
|
||||||
**Commit/Build:** [e.g. 426e106]
|
**Commit/Build:** [e.g. 426e106]
|
||||||
|
|
||||||
<!-- Explanation of the issue -->
|
<!-- Explanation of the issue -->
|
||||||
|
|
|
@ -7,7 +7,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.3.4
|
OPENRCT2_VERSION: 0.3.4.1
|
||||||
jobs:
|
jobs:
|
||||||
lint-commit:
|
lint-commit:
|
||||||
name: Lint Commit Message
|
name: Lint Commit Message
|
||||||
|
|
|
@ -1,7 +1,15 @@
|
||||||
openrct2 (0.3.4-develop-1) unstable; urgency=medium
|
openrct2 (0.3.4.1-develop-1) unstable; urgency=medium
|
||||||
|
|
||||||
* Nightly develop build.
|
* Nightly develop build.
|
||||||
|
|
||||||
|
openrct2 (0.3.4.1) stable; urgency=medium
|
||||||
|
|
||||||
|
* Fix: [#15028] Crash when placing large scenery.
|
||||||
|
* Fix: [#15048] Crash when removing litter with cheats.
|
||||||
|
* Fix: [#15052] Crash when using banner window.
|
||||||
|
* Fix: [#15063] Crash when opening large scenery signs.
|
||||||
|
* Improved: [#12626] Allow using RCT2 saves to mark RCT Classic (.sea) parks as finished and vice versa.
|
||||||
|
|
||||||
openrct2 (0.3.4) stable; urgency=medium
|
openrct2 (0.3.4) stable; urgency=medium
|
||||||
|
|
||||||
* Feature: [#13967] Track List window now displays the path to the design when debugging tools are on.
|
* Feature: [#13967] Track List window now displays the path to the design when debugging tools are on.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
0.3.4+ (in development)
|
0.3.4.1 (2021-07-25)
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
- Fix: [#15028] Crash when placing large scenery.
|
- Fix: [#15028] Crash when placing large scenery.
|
||||||
- Fix: [#15048] Crash when removing litter with cheats.
|
- Fix: [#15048] Crash when removing litter with cheats.
|
||||||
|
|
|
@ -66,6 +66,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.4.1" date="2021-07-25">
|
||||||
|
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.4.1</url>
|
||||||
|
</release>
|
||||||
<release version="0.3.4" date="2021-07-19">
|
<release version="0.3.4" date="2021-07-19">
|
||||||
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.4</url>
|
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.4</url>
|
||||||
</release>
|
</release>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.3.4</string>
|
<string>0.3.4.1</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>ORCT</string>
|
<string>ORCT</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Last updated: 2021-07-19
|
Last updated: 2021-07-25
|
||||||
Release version: 0.3.4
|
Release version: 0.3.4.1
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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.3.4-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.4+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
|
| [![OpenRCT2.org](https://img.shields.io/badge/master-v0.3.4.1-green.svg)](https://openrct2.org/downloads/master/latest) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.3.4.1+-blue.svg)](https://openrct2.org/downloads/develop/latest) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
|
@ -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.3.4
|
export OPENRCT2_VERSION=0.3.4.1
|
||||||
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
|
||||||
|
|
|
@ -10,7 +10,7 @@ android {
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
|
|
||||||
versionCode 2
|
versionCode 2
|
||||||
versionName '0.3.4'
|
versionName '0.3.4.1'
|
||||||
|
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#define OPENRCT2_NAME "OpenRCT2"
|
#define OPENRCT2_NAME "OpenRCT2"
|
||||||
#define OPENRCT2_VERSION "0.3.4"
|
#define OPENRCT2_VERSION "0.3.4.1"
|
||||||
|
|
||||||
#if defined(__amd64__) || defined(_M_AMD64)
|
#if defined(__amd64__) || defined(_M_AMD64)
|
||||||
# define OPENRCT2_ARCHITECTURE "x86-64"
|
# define OPENRCT2_ARCHITECTURE "x86-64"
|
||||||
|
|
Loading…
Reference in New Issue