1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

19692 Commits

Author SHA1 Message Date
Michael Steenbeek
a4d11d82e8 Merge pull request #21113 from spacek531/track/replace-track-paint-scheme-enum
Refactor track and supports colours in PaintSessionCore
2023-12-26 14:13:48 +01:00
mrmbernardi
98a52efb7e Fix #5677: Balloons pass through the ground and objects (#20483) 2023-12-26 08:28:19 -03:00
Spacek531
b6bcb8e106 Add secondary colour to supports scheme
The wooden roller coaster and air powered vertical coaster both
construct a paint scheme that incorporates the tertiary colour in the
primary slot and the secondary colour in the secondary slot.
Constructing the scheme requires at least one condition that can be
removed by constructing the scheme when populating the PaintSessionCore.
2023-12-23 17:13:27 -08:00
Spacek531
a890844115 replace TrackColours array with two ImageId values 2023-12-23 17:01:56 -08:00
Michael Steenbeek
3ab12eb659 Update objects to v1.3.12 2023-12-23 23:38:33 +01:00
spacek531
1306dc048b Remove SCHEME_MISC, SCHEME_3 from PaintSessionCore 2023-12-23 16:42:00 +01:00
Matt
2147b69104 Update the money effect even when the game is paused (#21102)
* Update the money effect even when the game is paused

* Update changelog.txt
2023-12-23 11:04:25 -03:00
Michael Steenbeek
c15391fbff Fix #21106: 25-deg-down 3x3 right turns rendered incorrectly 2023-12-23 14:03:23 +01:00
Michael Steenbeek
268eef2cf1 Consolidate Junior and Water RC track code 2023-12-23 01:54:43 +01:00
Max
895095acb9 Fix #12299 Placing ride entrances/exits ignores the Disable Clearance Checks cheat (#21096) 2023-12-21 20:38:20 +01:00
Fredrik Tegnell
3f5d4b8941 Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window (#21058)
* Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window

* Apply code formatting fixes

* Apply code formatting fixes

* Fix code review changes
2023-12-19 21:15:04 -03:00
Michael Steenbeek
9dd5fd8d98 Update support drawing for thrill rides and water rides (#21007)
* Update support drawing for thrill rides and water rides

* Consolidate support drawing calls for Go Karts
2023-12-18 07:38:25 -03:00
73
573ab043d6 Fix #13473: Lower Circus default price to avoid instant guest complaint (#21056)
From 1.50 to 1.20
2023-12-15 06:15:31 -03:00
Ted John
35a690bfa4 Merge pull request #21009 from Gymnasiast/refactor/covered-drawers
Split up drawing functions for covered track elements
2023-12-13 23:35:51 +00:00
Gymnasiast
a19250c5be Remove now-redundant code in WaterCoaster.cpp
More consolidation is possible (by making JuniorRollerCoaster.cpp use a template like BolligerMabillardTrack.hpp), but probably best left for another PR.
2023-12-13 23:03:38 +01:00
ZeeMaji
ac3ab7e1d2 Fix #20311: Restore removed coaster colour presets (#20880)
* Restore removed coaster colour presets

* Update changelog entry

* Add lost purple impulse preset

* Add lost yellow and red presets to impulse

* Fix typo in purple impulse preset

* Remove accidentally included hairpin presets from impulse
2023-12-12 07:15:00 -03:00
Gymnasiast
5e38c15f58 Split up drawing functions for covered track elements 2023-12-10 15:11:46 +01:00
Michael Bernardi
8c7d1d149a Added OpenGL TTF hinting 2023-12-08 01:13:17 +01:00
Michael Bernardi
f64706e1d9 Add insetting and outlining to OpenGL TTF rendering 2023-12-08 01:13:17 +01:00
spacek531
6162ff9b00 Replace TrackElemType::Booster reference with TrackTypeIsBooster() (#21044) 2023-12-06 08:18:41 -03:00
spacek531
ccb3fa172c Add TrackTypeIsBooster method (#21033) 2023-12-02 14:53:16 -03:00
Michael Steenbeek
baf88ef490 Refactor in-memory track design element (#21010) 2023-12-02 14:43:03 -03:00
AuraSpecs
83598ba898 OpenMusic release v1.5 (#21004)
Adds Rock style 4 ride music by Blackend Blue.
2023-11-28 06:09:58 -03:00
ζeh Matt
19f09dae14 Refactor PlatformEnvironment to avoid static initialization 2023-11-25 16:58:28 +02:00
ζeh Matt
62c0bc2cf5 Remove 13k dynamic initializer by changing SpriteGroupNames type 2023-11-25 16:22:45 +02:00
mrmbernardi
efea009ed5 Fix #20624: Clear scrolling text cache on language change (#20993) 2023-11-20 22:31:35 +00:00
Gymnasiast
8df55ce5a9 Use modern support calls in TrackPaint.cpp 2023-11-17 23:24:45 +01:00
Gymnasiast
22c23a70c6 Update facility and shop support calls 2023-11-17 23:23:06 +01:00
Gymnasiast
f6c112bf50 Update entrance support calls 2023-11-17 23:20:03 +01:00
Gymnasiast
5caab670ce Add additional transition types 2023-11-17 23:19:23 +01:00
Gymnasiast
6421680e4e Further consolidate support calls on the heartline roll 2023-11-17 23:15:49 +01:00
Gymnasiast
9d903efb08 Update and consolidate supports calls in HLTC 2023-11-17 23:15:49 +01:00
Ted John
18dec7d5c5 Merge pull request #20969 from Gymnasiast/refactor/more-wooden-supports
Replace usages of old WoodenBSupportsSetup() overload
2023-11-17 17:59:17 +00:00
HtotheTML
42deffd5bb Fix #17774: gaps and errors in park boundaries and construction rights for RCT1 and RCT2 scenarios (#19657)
* Update S6Importer.cpp

* clang format error. Added changelog entry.

* Update S6Importer.cpp

* Added fixes for RCT1 scenarios

The issues in Katie's Dreamland, Utopia Park, Urban Park, Pleasure Island, and Fort Anachronism listed in issue #17774 have been now dealt with.

* Added land for Cradle's underwater path.

* Update changelog.txt

* Updated changelog.

* specify text for path fix in Cradle

* Update S6Importer.cpp

* More missing tiles in Coastal Reclaim & Salvage

* Update S6Importer.cpp

* Update S6Importer.cpp

* missed tile in stone age

* Classic compatibility

Added edit compatibility for classic scenarios on rct2 maps.

* Update changelog.txt

* Update S6Importer.cpp

* Update S6Importer.cpp

* Update S6Importer.cpp

* Fun At The Beach

Fixed errant tiles in Fun at the Beach.

* Update S6Importer.cpp

* Update S6Importer.cpp

* Extreme Heights Fix

missing tiles along edge of Extreme Heights park boundary; should run to 1 tile from the edge of the map almost all the way around.

* Final Set of Changes

Did a quick run-through of all the maps looking for any possible missed spots. I did find a series of spots, some clearly meant to be owned, and others that I'm a bit less than sure about. For now, I've commented out the spots that I don't feel are strictly necessary to have included, while the remaining ones I feel are necessary.

* Update S4Importer.cpp

* add optional fixes

un-commented the extra changes; they are now included.

* Update changelog.txt

* fix clang format error

* Update changelog.txt

* Update S6Importer.cpp

OOB underground path

* Update S6Importer.cpp

* Update S6Importer.cpp

* above runaway plumber gaps

* Update changelog.txt
2023-11-17 08:23:05 -03:00
Kostadin
11c46987ae Add #include <algorithm> to fix building with gcc 14 (#20981)
With gcc 14 some C++ Standard Library headers have been changed to no
longer include other headers that were used internally by the library.
In OpenRCT2's case it is the <algorithm> header.

Downstream Gentoo bug: https://bugs.gentoo.org/917016

GCC 14 porting guide: https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes

Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
2023-11-16 21:26:05 +01:00
Michael Steenbeek
f8d71fcc2f Fix #20253, #20799, #20841, #20903, #20915: Crash when displaying a Lay-Down RC’s half loop (#20968)
* Fix #20253: Crash when displaying a Lay-Down RC’s half loop

* Bump network version
2023-11-15 23:36:14 -03:00
Gymnasiast
d0fe45048b Make old WoodenBSupportsPaintSetup() overload static 2023-11-14 20:30:49 +01:00
Gymnasiast
fd0b90a049 Consolidate WoodenBSupportsPaintSetup() calls in WoodenRollerCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
76a8ef55d3 Use new WoodenBSupportsPaintSetup() overloads in WoodenRollerCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
9cd04f2016 Use WoodenBSupportsPaintSetupRotated() in HybridCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
666b60ccee Consolidate WoodenBSupportsPaintSetup() calls in Side-Friction RC 2023-11-14 20:30:34 +01:00
Gymnasiast
e6c7c4d977 Use new WoodenBSupportsPaintSetup() overloads in Side-Friction RC 2023-11-14 20:30:21 +01:00
Gymnasiast
ff70e0e1e7 Use new WoodenBSupportsPaintSetup() overloads in MiniatureRailway.cpp 2023-11-14 20:30:10 +01:00
Gymnasiast
7f458f5b46 Call WoodenA/B functions directly in MiniatureRailway.cpp 2023-11-14 20:30:10 +01:00
Gymnasiast
f47cfa79c0 Use WoodenBSupportsSetupRotated() for scenery supports drawing 2023-11-14 20:30:09 +01:00
Fredrik Tegnell
af7086e283 Close #12078: Add shortcut key for sloping walls (#20860)
* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Apply code formatting fixes

* Apply code formatting fixes

* Apply modulus operator to make code more concise

* Change string ID

* Apply code formatting fix

* Apply code formatting fix
2023-11-12 08:10:56 -03:00
KawkMob
135c8b9f9b Fix #20747: handle staff speed permanency/serialization/apply for new staff (#20756) 2023-11-12 08:06:51 -03:00
Maciek
d6a481b066 Close #20881: Replace monorail_diag_blocked_segments with DiagBlockedSegments (#20961)
Removed monorail_diag_blocked_segments. Replaced the references with DiagBlockedSegments.
2023-11-12 08:04:25 -03:00
ζeh Matt
37cdc40799 Fix #20964: Crash when invalid network group id is used 2023-11-11 18:59:46 +02:00
mrmbernardi
e914ffedaf Fix #20944: Add cstdint to EnumMap and EntryList (#20945) 2023-11-04 19:55:35 +00:00