Skip to content

Add diagonal downward-inclined brakes to hybrid coaster and single rail coaster #22905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

fidwell
Copy link
Contributor

@fidwell fidwell commented Oct 5, 2024

Follow-up to #22383. As before, original sprites created by @X123M3-256 and edited by me.

image

@fidwell fidwell marked this pull request as ready for review October 5, 2024 00:26
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch 4 times, most recently from fc9ff44 to 8a7befa Compare October 12, 2024 15:05
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from 911487d to 219ecb5 Compare October 17, 2024 17:39
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from 219ecb5 to f2d8f98 Compare October 27, 2024 14:47
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from f2d8f98 to 1090af7 Compare November 6, 2024 23:39
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from e92db87 to a09928d Compare November 25, 2024 00:47
Copy link
Member

@karst karst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Textures look good. All works as it should.

@karst karst added network version Network version needs updating - double check before merging! park file version Requires updating the park file version number labels Nov 28, 2024
@karst
Copy link
Member

karst commented Nov 28, 2024

Park file version up disappeared with rebase.

@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from 8233d2f to 917a09a Compare December 8, 2024 23:50
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch 3 times, most recently from 7e8ca3c to 8cd7300 Compare January 7, 2025 01:30
@733737
Copy link
Contributor

733737 commented Jan 15, 2025

Is this a planned part of this coming release?

@AaronVanGeffen
Copy link
Member

It's not currently part of the milestone for the upcoming release. Before it can be considered, the PR will first need to be rebased.

@AaronVanGeffen AaronVanGeffen added the pending rebase PR needs to be rebased. label Jan 15, 2025
@fidwell
Copy link
Contributor Author

fidwell commented Jan 15, 2025

Yeah I've been coming in and rebasing it every couple of weeks, but no one besides Karst has expressed interest in reviewing it yet. I'll rebase it again soon.

@SpartanFrederic104
Copy link
Contributor

I'd like to test this.

@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from 8cd7300 to d8332c2 Compare January 15, 2025 22:34
@AaronVanGeffen AaronVanGeffen removed the pending rebase PR needs to be rebased. label Jan 15, 2025
@fidwell fidwell marked this pull request as draft January 15, 2025 22:55
@fidwell
Copy link
Contributor Author

fidwell commented Jan 15, 2025

Something weird broke after I rebased this time; probably because X7's new track pieces beat mine into main. I can't even get Visual Studio to run the build anymore. I'll have to take a look at this some other day.

Never mind, it does seem to work now. This action has working builds. New track pieces are all available.

image

@fidwell fidwell marked this pull request as ready for review January 15, 2025 23:17
Copy link
Contributor

@SpartanFrederic104 SpartanFrederic104 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did some testing with the new diagonal downward brakes, the sprites look fantastic and the brakes function as intended. I didn't find any glitching or bugs so far.

@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from d8332c2 to 327eb5d Compare January 20, 2025 22:23
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch 2 times, most recently from 6f678d9 to 3b8eab9 Compare January 20, 2025 22:25
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch 3 times, most recently from 813029e to b9140e2 Compare February 3, 2025 22:30
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from b9140e2 to dad3839 Compare February 16, 2025 15:58
@AaronVanGeffen AaronVanGeffen added this to the v0.4.20 milestone Feb 16, 2025
@AaronVanGeffen
Copy link
Member

This needs to be tested a fair bit, but I'd like to get this in. I've added this to the milestone so we hopefully get it in for this merge window.

@SpartanFrederic104
Copy link
Contributor

SpartanFrederic104 commented Feb 16, 2025

I'll gladly test this again.

UPDATE (10:08 PST): The diagonal downward brakes are still working as expected. The sprites for the new track pieces look great, and I didn't find any major glitching whatsoever.
Fred's Workbench 2025-02-16 10-02-53
Fred's Workbench 2025-02-16 10-03-18

Copy link
Member

@Gymnasiast Gymnasiast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I have one little change.

@Gymnasiast
Copy link
Member

Could you bump the network version? This is ready to go.

@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from 42a9cb0 to a3594fe Compare February 19, 2025 13:54
@fidwell fidwell force-pushed the sloped-brakes/diagonal branch from a3594fe to e69e738 Compare February 19, 2025 13:56
@fidwell
Copy link
Contributor Author

fidwell commented Feb 19, 2025

Bumped and squashed. Thanks for taking a look.

@Gymnasiast Gymnasiast merged commit abaf8d2 into OpenRCT2:develop Feb 19, 2025
23 checks passed
@fidwell fidwell deleted the sloped-brakes/diagonal branch February 19, 2025 21:22
Gymnasiast added a commit to Gymnasiast/OpenRCT2 that referenced this pull request Feb 25, 2025
- Feature: [OpenRCT2#22905] Add diagonal downward-inclined brakes to hybrid coaster and single rail coaster.
- Feature: [OpenRCT2#23759] Add see-through option to the “Cut-away View“.
- Improved: [OpenRCT2#23677] Building new ride track now inherits the colour scheme from the previous piece.
- Improved: [OpenRCT2#23720] Text fields now allow cutting to clipboard (Ctrl+X) in addition to copy and paste.
- Improved: [OpenRCT2#23874] The load/save file browser window now uses icons for its action buttons.
- Improved: [OpenRCT2#23875] Rides forbidden to be modified or destroyed can now be edited with the All destructible cheat.
- Improved: [OpenRCT2#23879] Unique weather icons for snow, heavy snow and blizzard.
- Fix: [OpenRCT2#1972, OpenRCT2#11679] Vehicles passing by toilets can cause them to glitch (original bug).
- Fix: [OpenRCT2#9999, OpenRCT2#10000, OpenRCT2#10001, OpenRCT2#10002, OpenRCT2#10003] Truncated scenario strings when using Catalan, Czech, Japanese, Polish or Russian.
- Fix: [OpenRCT2#14486] Guests will fall through upwards sloped paths when making their way through a park entrance or ride exit (original bug).
- Fix: [OpenRCT2#15826, OpenRCT2#23835] Wooden Roller Coaster steep turn supports glitch when train goes over them (original bug).
- Fix: [OpenRCT2#16357] Chairlift station covers draw incorrectly.
- Fix: [OpenRCT2#16657] Mine Ride right S-bend uses Mini Roller Coaster sprite (original bug).
- Fix: [OpenRCT2#18376] Ghost train gentle to flat track is not visible in tunnels.
- Fix: [OpenRCT2#18389] Gentle sloped track pieces are not visible in low clearance height tunnels (original bug).
- Fix: [OpenRCT2#18423] Underground Mini Golf holes can draw over land edges (original bug).
- Fix: [OpenRCT2#18433] CJK TrueType fonts cannot be located when font names are translated by the OS.
- Fix: [OpenRCT2#18436] Scenery on the same tile as steep to vertical track can draw over the track (original bug).
- Fix: [OpenRCT2#18711] Park entrances with their sides underground can cause glitching.
- Fix: [OpenRCT2#20848] Junior Roller Coaster booster track does not draw correctly in tunnels.
- Fix: [OpenRCT2#20948] Incorrect diagonal brakes supports on the Giga Coaster, Looping Roller Coaster and Wooden Roller Coaster.
- Fix: [OpenRCT2#21768] Dirty blocks debug overlay is rendered incorrectly on high DPI screens.
- Fix: [OpenRCT2#22229] Opening a park save file from a newer version of OpenRCT2 yields an unhelpful error message.
- Fix: [OpenRCT2#22617] Sloped Wooden and Side-Friction supports draw out of order when built directly above diagonal track pieces (original bug).
- Fix: [OpenRCT2#22620] Mine Train Coaster trains glitch on large banked turns.
- Fix: [OpenRCT2#23522] Diagonal sloped Steeplechase supports have glitched sprites at the base.
- Fix: [OpenRCT2#23580] Table header labels may overlap if the window is made very small.
- Fix: [OpenRCT2#23641] Steep to flat track is not drawn correctly in tunnels (original bug).
- Fix: [OpenRCT2#23795] Looping Roller Coaster vertical loop supports are drawn incorrectly.
- Fix: [OpenRCT2#23797] 3D Text cut off too early on multi-line signs.
- Fix: [OpenRCT2#23809] Trains glitch on Bobsleigh Coaster small helixes.
- Fix: [OpenRCT2#23811] Land edges glitch when vehicles go through gentle to flat tunnels.
- Fix: [OpenRCT2#23814] Scenarios not indexed on first start.
- Fix: [OpenRCT2#23818] Spinning tunnels can draw over sloped terrain in front of them.
- Fix: [OpenRCT2#23828] Vehicles passing by station entrances and exits can cause them to glitch (original bug).
- Fix: [OpenRCT2#23831] Hybrid Coaster large gentle banked right turns glitch when diagonal track is above them.
- Fix: [OpenRCT2#23832] Hybrid Coaster large gentle banked left turns supports glitch as train passes.
- Fix: [OpenRCT2#23836] Adjacent track can draw over large turns (original bug).
- Fix: [OpenRCT2#23858] LSM launched lift hill has a misaligned sprite.
CorySanin added a commit to CorySanin/OpenRCT2 that referenced this pull request Jun 22, 2025
- Feature: [OpenRCT2#22905] Add diagonal downward-inclined brakes to hybrid coaster and single rail coaster.
- Feature: [OpenRCT2#23759] Add see-through option to the “Cut-away View“.
- Improved: [OpenRCT2#23677] Building new ride track now inherits the colour scheme from the previous piece.
- Improved: [OpenRCT2#23720] Text fields now allow cutting to clipboard (Ctrl+X) in addition to copy and paste.
- Improved: [OpenRCT2#23874] The load/save file browser window now uses icons for its action buttons.
- Improved: [OpenRCT2#23875] Rides forbidden to be modified or destroyed can now be edited with the All destructible cheat.
- Improved: [OpenRCT2#23879] Unique weather icons for snow, heavy snow and blizzard.
- Fix: [OpenRCT2#1972, OpenRCT2#11679] Vehicles passing by toilets can cause them to glitch (original bug).
- Fix: [OpenRCT2#9999, OpenRCT2#10000, OpenRCT2#10001, OpenRCT2#10002, OpenRCT2#10003] Truncated scenario strings when using Catalan, Czech, Japanese, Polish or Russian.
- Fix: [OpenRCT2#14486] Guests will fall through upwards sloped paths when making their way through a park entrance or ride exit (original bug).
- Fix: [OpenRCT2#15826, OpenRCT2#23835] Wooden Roller Coaster steep turn supports glitch when train goes over them (original bug).
- Fix: [OpenRCT2#16357] Chairlift station covers draw incorrectly.
- Fix: [OpenRCT2#16657] Mine Ride right S-bend uses Mini Roller Coaster sprite (original bug).
- Fix: [OpenRCT2#18376] Ghost train gentle to flat track is not visible in tunnels.
- Fix: [OpenRCT2#18389] Gentle sloped track pieces are not visible in low clearance height tunnels (original bug).
- Fix: [OpenRCT2#18423] Underground Mini Golf holes can draw over land edges (original bug).
- Fix: [OpenRCT2#18433] CJK TrueType fonts cannot be located when font names are translated by the OS.
- Fix: [OpenRCT2#18436] Scenery on the same tile as steep to vertical track can draw over the track (original bug).
- Fix: [OpenRCT2#18711] Park entrances with their sides underground can cause glitching.
- Fix: [OpenRCT2#20848] Junior Roller Coaster booster track does not draw correctly in tunnels.
- Fix: [OpenRCT2#20948] Incorrect diagonal brakes supports on the Giga Coaster, Looping Roller Coaster and Wooden Roller Coaster.
- Fix: [OpenRCT2#21768] Dirty blocks debug overlay is rendered incorrectly on high DPI screens.
- Fix: [OpenRCT2#22229] Opening a park save file from a newer version of OpenRCT2 yields an unhelpful error message.
- Fix: [OpenRCT2#22617] Sloped Wooden and Side-Friction supports draw out of order when built directly above diagonal track pieces (original bug).
- Fix: [OpenRCT2#22620] Mine Train Coaster trains glitch on large banked turns.
- Fix: [OpenRCT2#23522] Diagonal sloped Steeplechase supports have glitched sprites at the base.
- Fix: [OpenRCT2#23580] Table header labels may overlap if the window is made very small.
- Fix: [OpenRCT2#23641] Steep to flat track is not drawn correctly in tunnels (original bug).
- Fix: [OpenRCT2#23795] Looping Roller Coaster vertical loop supports are drawn incorrectly.
- Fix: [OpenRCT2#23797] 3D Text cut off too early on multi-line signs.
- Fix: [OpenRCT2#23809] Trains glitch on Bobsleigh Coaster small helixes.
- Fix: [OpenRCT2#23811] Land edges glitch when vehicles go through gentle to flat tunnels.
- Fix: [OpenRCT2#23814] Scenarios not indexed on first start.
- Fix: [OpenRCT2#23818] Spinning tunnels can draw over sloped terrain in front of them.
- Fix: [OpenRCT2#23828] Vehicles passing by station entrances and exits can cause them to glitch (original bug).
- Fix: [OpenRCT2#23831] Hybrid Coaster large gentle banked right turns glitch when diagonal track is above them.
- Fix: [OpenRCT2#23832] Hybrid Coaster large gentle banked left turns supports glitch as train passes.
- Fix: [OpenRCT2#23836] Adjacent track can draw over large turns (original bug).
- Fix: [OpenRCT2#23858] LSM launched lift hill has a misaligned sprite.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
network version Network version needs updating - double check before merging! park file version Requires updating the park file version number
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants