mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2025-12-10 09:32:29 +01:00
Merge branch 'master' into develop
This commit is contained in:
Gymnasiast
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -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.4.1
|
||||
OPENRCT2_VERSION: 0.3.5
|
||||
jobs:
|
||||
lint-commit:
|
||||
name: Lint Commit Message
|
||||
|
||||
64
debian/changelog
vendored
64
debian/changelog
vendored
@@ -1,6 +1,66 @@
|
||||
openrct2 (0.3.4.1-develop-1) unstable; urgency=medium
|
||||
openrct2 (0.3.5-develop-1) unstable; urgency=medium
|
||||
|
||||
* Nightly develop build.
|
||||
* Nightly develop build.
|
||||
|
||||
openrct2 (0.3.5) stable; urgency=medium
|
||||
|
||||
* Feature: [#3868] Initial support for using TTF in OpenGL mode (still contains bugs).
|
||||
* Feature: [#7682] Follow ride/guest/staff in main window viewport.
|
||||
* Feature: [#13407] Allow building chain lifts on enclosed dinghy slide pieces when cheats are on.
|
||||
* Feature: [#15084] [Plugin] Add "vehicle.crash" hook.
|
||||
* Feature: [#15143] Added a shortcut key for Giant Screenshot.
|
||||
* Feature: [#15164] Highlight elements selected by the Tile Inspector, tracks are currently not supported.
|
||||
* Feature: [#15165] [Plugin] Add the ability to create entities using "map.createEntity".
|
||||
* Feature: [#15194] [Plugin] Add guest properties, ride downtime and park casualty penalty.
|
||||
* Feature: [#15195] Added a bug-report item in file dropdown menu.
|
||||
* Feature: [#15294] New vehicle animation type: flying animal.
|
||||
* Fix: [#10614] Track Designs with missing path(s) do not use alternate pathways.
|
||||
* Fix: [#12981] New vehicles do not appear in vehicle type dropdown.
|
||||
* Fix: [#13465] Creating a scenario based on a won save game results in a scenario that’s instantly won.
|
||||
* Fix: [#13912] “Dome park” no longer renders dome correctly.
|
||||
* Fix: [#14316] Closing the Track Designs Manager window causes broken state.
|
||||
* Fix: [#14482, #15258] Rides with invisibility hacks sometimes behave incorrectly.
|
||||
* Fix: [#14649] ImageImporter incorrectly remaps colours outside the RCT2 palette.
|
||||
* Fix: [#14667] “Extreme Hawaiian Island” has unpurchaseable land tiles (original bug).
|
||||
* Fix: [#14741] Crash when exiting OpenRCT2 on macOS.
|
||||
* Fix: [#15096] Crash when placing entrances in the scenario editor near the map corner.
|
||||
* Fix: [#15136] Exported SV6 files cause vanilla RCT2 to hang.
|
||||
* Fix: [#15142] ToonTowner's mine roofs were moved into the pirate theme scenery group instead of the mine theme scenery group.
|
||||
* Fix: [#15148] Track Designs Manager delete confirmation window doesn't display properly.
|
||||
* Fix: [#15170] Plugin: incorrect label text alignment.
|
||||
* Fix: [#15177] Crash in lightfx_add_lights_magic_vehicle().
|
||||
* Fix: [#15184] Crash when hovering over water types in Object Selection.
|
||||
* Fix: [#15193] Crash when rides/stalls are demolished.
|
||||
* Fix: [#15197] Cannot place flat ride after removing it in construction window.
|
||||
* Fix: [#15199] Construction window is not closed when a ride gets demolished.
|
||||
* Fix: [#15213] Freeze when hovering over Reverse Freefall Coaster in Russian.
|
||||
* Fix: [#15227] Crash on exit after hovering over water types in the Object Selection window.
|
||||
* Fix: [#15255] Tile Inspector shows banner information on walls that do not contain one.
|
||||
* Fix: [#15257] Chat icon shows in scenario/track editor. Other icons don't disable when deactivated in options menu.
|
||||
* Fix: [#15289] Unexpected behavior with duplicated banners which also caused desyncs in multiplayer.
|
||||
* Fix: [#15322] Circus music doesn't play.
|
||||
* Fix: [#15377] Entrance/exit ghost doesn't work on different stations without touching them first.
|
||||
* Fix: [#15451] Guest list name filter remains after group selection.
|
||||
* Fix: [#15466] Crash when opening a dropdown with 0 rows.
|
||||
* Fix: [#15476] Crash when placing/clearing small scenery.
|
||||
* Fix: [#15487] Map animations do not work correctly when loading an exported SV6 file in vanilla RCT2.
|
||||
* Fix: [#15490] Tile inspector needlessly updates clearance height when changing surface slopes.
|
||||
* Fix: [#15496] Crash in paint_swinging_inverter_ship_structure().
|
||||
* Fix: [#15503] Freeze when doing specific coaster merges with block brakes.
|
||||
* Fix: [#15514] Two different “quit to menu” menu items are available in track designer and track design manager.
|
||||
* Fix: [#15560] Memory leak due to OpenGL Renderer not releasing a texture.
|
||||
* Fix: [#15567] Litter not being counted correctly during Park rating calculation (original bug).
|
||||
* Fix: [#15579] Crash in track_block_get_next().
|
||||
* Fix: [#15582] [Plugin] Litter properties return incorrect values.
|
||||
* Fix: [#15584] Ride income underflows when on-ride photos are making losses.
|
||||
* Fix: [#15612] Crash when placing walls beside certain scenery objects.
|
||||
* Fix: [#15851] Incorrect percentage chance of jumping with Katie Smith cheat.
|
||||
* Fix: [#15858] Joanne Barton and Emma Garrell cheat incorrectly not applying effects to self.
|
||||
* Improved: [#3417] Crash dumps are now placed in their own folder.
|
||||
* Improved: [#13524] macOS arm64 native (universal) app
|
||||
* Improved: [#15538] Software rendering can now draw in parallel when Multithreading is enabled.
|
||||
* Change: [#8601] Revert ToonTower base block fix to re-enable support blocking.
|
||||
* Change: [#15174] [Plugin] Deprecate the type "peep" and add support to target a specific scripting api version.
|
||||
|
||||
openrct2 (0.3.4.1) stable; urgency=medium
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
0.3.4.1+ (in development)
|
||||
0.3.5+ (in development)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
0.3.5 (2021-11-06)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: [#3868] Initial support for using TTF in OpenGL mode (still contains bugs).
|
||||
- Feature: [#7682] Follow ride/guest/staff in main window viewport.
|
||||
|
||||
@@ -66,6 +66,9 @@
|
||||
<content_attribute id="money-gambling">none</content_attribute>
|
||||
</content_rating>
|
||||
<releases>
|
||||
<release version="0.3.5" date="2021-11-06">
|
||||
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.5</url>
|
||||
</release>
|
||||
<release version="0.3.4.1" date="2021-07-25">
|
||||
<url>https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.3.4.1</url>
|
||||
</release>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.3.4.1</string>
|
||||
<string>0.3.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>ORCT</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Last updated: 2021-07-25
|
||||
Release version: 0.3.4.1
|
||||
Last updated: 2021-11-06
|
||||
Release version: 0.3.5
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m
|
||||
### Download
|
||||
| Latest release | Latest development build |
|
||||
|----------------|--------------------------|
|
||||
| [](https://openrct2.org/downloads/master/latest) | [](https://openrct2.org/downloads/develop/latest) |
|
||||
| [](https://openrct2.org/downloads/master/latest) | [](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.4.1
|
||||
export OPENRCT2_VERSION=0.3.5
|
||||
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.4.1'
|
||||
versionName '0.3.5'
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <string>
|
||||
|
||||
#define OPENRCT2_NAME "OpenRCT2"
|
||||
#define OPENRCT2_VERSION "0.3.4.1"
|
||||
#define OPENRCT2_VERSION "0.3.5"
|
||||
|
||||
#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 "18"
|
||||
#define NETWORK_STREAM_VERSION "0"
|
||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||
|
||||
static Peep* _pickup_peep = nullptr;
|
||||
|
||||
@@ -54,7 +54,7 @@ const wchar_t* _wszCommitSha1Short = WSZ("");
|
||||
// OPENRCT2_ARCHITECTURE is required to be defined in version.h
|
||||
const wchar_t* _wszArchitecture = WSZ(OPENRCT2_ARCHITECTURE);
|
||||
|
||||
# define BACKTRACE_TOKEN L"742b8d9d70c52df663e4f2449f90039cf9406f89e57ecb90b0f086ba16e33d20"
|
||||
# define BACKTRACE_TOKEN L"286a09f8b2c044aab6389a4c4c2b0b1decfbd1860badb5da84a95effee3a3210"
|
||||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user