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

28936 Commits

Author SHA1 Message Date
Aaron van Geffen
f5faef7bea Scenery window: increase minimum height
This increases the minimum height of the Scenery window to fit at least 1.5 rows of scenery items, instead of 1 row. This is done to ensure the eyedropper and scatter tools are visible with multiple rows of tabs as well.

Before:
<img width="634" height="224" alt="Imagination Megapark 2025-09-15 22-38-56" src="https://github.com/user-attachments/assets/dcce9fad-a8e1-4001-9552-dd1ff97c082c" />

After:
<img width="634" height="264" alt="Imagination Megapark 2025-09-15 22-38-46" src="https://github.com/user-attachments/assets/8e545aa7-8aef-4642-b78e-858bed2db1e8" />
2025-09-17 21:51:12 +00:00
Aaron van Geffen
51b4bbbce5 Allow shifting track designs underground
Since about a year ago, OpenRCT2 has allowed players to shift ride/track designs using modifier keys (#22669). This was, however, limited to heights above-ground. This PR changes this by omitting the 'Z placement assist' when ctrl/shift modifiers are used. This means the helpful 'nudge' to overground is now omitted if (and only if) these modifier keys are involved.

Below is an example of what placement now looks like (with clearance checks disabled for easier debugging):

https://github.com/user-attachments/assets/3b23bc1d-ab7b-43a2-ad40-216ab83952d2
2025-09-17 23:09:07 +02:00
Michael Steenbeek
3330513511 Merge pull request #25194 from Gymnasiast/refactor/more-lcc
Code style updates in UI-related files
2025-09-17 23:06:01 +02:00
Gymnasiast
3a803e13e2 Change window functions to use lowerCamelCase 2025-09-17 20:10:12 +02:00
Gymnasiast
d4a0bca091 Rename Window fields 2025-09-17 20:10:12 +02:00
Gymnasiast
a613b2604a Replace RCT_WINDOW_{RIGHT,BOTTOM} defines 2025-09-17 20:10:12 +02:00
Gymnasiast
f46fea3bff Rename rct_windownumber to WindowNumber 2025-09-17 20:10:12 +02:00
Gymnasiast
8a7a265639 Rename member of WidgetIdentifier and WidgetRef 2025-09-17 20:10:12 +02:00
Gymnasiast
2a792987a7 Rename local variables like ‘pressedWidgets’ in anticipation of field renames 2025-09-17 20:10:12 +02:00
Gymnasiast
0dd36af869 Rename centre_2d_coordinates to centre2dCoordinates 2025-09-17 20:10:11 +02:00
Gymnasiast
eca7870818 Make ViewportCreate take a reference to a window 2025-09-17 20:10:11 +02:00
Gymnasiast
28fbe83a27 Rename g_music_tracking_viewport to gMusicTrackingViewport 2025-09-17 20:10:11 +02:00
Gymnasiast
b6e09bbc7e Change code style of enums in Viewport.h 2025-09-17 20:10:11 +02:00
Michael Steenbeek
88e68a5e3b Prevent PRs marked "on hold" from going stale (#25188) 2025-09-17 00:23:59 +02:00
mix
58c5ae1d3b Fix hybrid coaster diag flat support blocks and clearance height 2025-09-16 13:50:17 +02:00
spacek531
b65f633456 Fix checking incorrect flags field when determining number of sprites of legacy vehicles 2025-09-16 13:46:09 +02:00
mix
0661a3e1d0 Don't set rightMousePressed flag in InputViewportDragBegin (#25186) 2025-09-16 00:39:50 +02:00
Michael Steenbeek
a5c49b37e1 Merge pull request #25161 from Gymnasiast/change/ride-value-to-vanilla
Restore maximum ride price algo to vanilla
2025-09-15 23:28:38 +02:00
Gymnasiast
a0a4a7823a Amend changelog, bump network and park file versions 2025-09-15 23:12:13 +02:00
duncanspumpkin
893fbdc2b4 Use correct hash 2025-09-15 23:11:55 +02:00
duncanspumpkin
a13cfab51c Update replays 2025-09-15 23:11:55 +02:00
Gymnasiast
1557e20a2a Restore maximum ride price algo to vanilla
This reverses the functional changes made in #5294. While the new
algorithm works out well for roller coaster and encourages better
rides in general, it is hampered by the fact that the value of
flat rides is abysmal and this means that you can never ask a
decent price.

This should probably be fixed at the source instead of
papered over by an absolute bonus, but fixing that is a lot more
delicate and complicated than restoring vanilla’s behaviour.
Something to revisit at a later date and with sufficient testing.
2025-09-15 23:11:55 +02:00
matheusvb3
2ad4d4be72 Add isEntertainer method to Staff class, small cleanup 2025-09-15 23:00:13 +02:00
Aaron van Geffen
99065960f2 Rename InputFlags::unk{4,5} to {left,right}MousePressed 2025-09-15 22:44:39 +02:00
mix
fabd171ff5 Fix LIM launched inline twists general support heights 2025-09-15 10:32:32 +02:00
Aaron van Geffen
51975ffed7 Merge pull request #25144 from AaronVanGeffen/ride-manager
Pass GameState and ParkData refs in more places
2025-09-14 22:04:30 +02:00
Michael Steenbeek
6e6e77bb57 Refactor more path stuff (#25173)
* Pass entrance path type to game action

Fixes a desync when placing a park entrance in multiplayer

* Remove unused gFootpathSelectedId

* Move two footpath globals into the window

* Move FootpathGetDefaultSurface() into window

* Move WallInTheWay() to Wall.{cpp,h}

* Create FootpathGetPlacementFromScreenCoords()
2025-09-14 19:18:31 +02:00
Gymnasiast
129c69927e Create FootpathGetPlacementFromScreenCoords() 2025-09-14 17:09:26 +02:00
Gymnasiast
5cc8ab4fa5 Move WallInTheWay() to Wall.{cpp,h} 2025-09-14 17:09:26 +02:00
Gymnasiast
61db76f74b Move FootpathGetDefaultSurface() into window 2025-09-14 17:09:26 +02:00
Gymnasiast
4cf07f181d Move two footpath globals into the window 2025-09-14 17:09:26 +02:00
Gymnasiast
121c2e0831 Remove unused gFootpathSelectedId 2025-09-14 17:09:26 +02:00
Gymnasiast
a3d4db9287 Pass entrance path type to game action
Fixes a desync when placing a park entrance in multiplayer
2025-09-14 17:09:26 +02:00
Michael Steenbeek
63a1c49db2 Refactor footpath placement functions 2025-09-14 14:25:08 +02:00
mix
0e21f93359 Fix Junior RC flat to steep general support heights different to RCT1 2025-09-14 14:16:42 +02:00
OpenRCT2 git bot
d5c2eb2a57 Merge Localisation/master into OpenRCT2/develop 2025-09-13 04:02:12 +00:00
mix
ea66706fbb Fix go karts steep to flat general support heights 2025-09-12 20:42:03 +02:00
Aaron van Geffen
0c2a52dd36 Move command line units into OpenRCT2 namespace 2025-09-12 18:07:23 +02:00
Aaron van Geffen
316572e824 Park: pass ParkData ref directly to Park::Update 2025-09-12 17:53:51 +02:00
Aaron van Geffen
60c88f7b3c Park: distinguish between CalculateParkSize and Park::UpdateSize 2025-09-12 15:57:34 +02:00
Michael Steenbeek
09d348f4e4 Merge pull request #25157 from AaronVanGeffen/context-cleanup
Move types and constants out of Context.h
2025-09-12 15:01:25 +02:00
Aaron van Geffen
f60b352259 Merge pull request #25156 from ZehMatt/optimize-entity-type-check
Some micro optimizations, code cleanup
2025-09-12 14:38:34 +02:00
ζeh Matt
1b1f8123b9 Move Guest specific ThrowUp logic to Guest.cpp 2025-09-12 15:08:18 +03:00
Aaron van Geffen
9b7ee06e0f Move Context fully into OpenRCT2 namespace; types into Input.h 2025-09-12 14:03:44 +02:00
ζeh Matt
2e6ffa4285 No need to double check if its Guest or Staff 2025-09-12 14:58:07 +03:00
ζeh Matt
ce3da4012e Remove redundant cast 2025-09-12 14:57:50 +03:00
ζeh Matt
977ec4517f Reduce scope of some variables 2025-09-12 14:52:34 +03:00
Aaron van Geffen
ffa2c3ab6c Move game tick time constants from Context.h to Game.h 2025-09-12 13:45:16 +02:00
Aaron van Geffen
499af79831 Move Resolution struct from Context to UiContext 2025-09-12 13:42:30 +02:00
ζeh Matt
4698ddc5f5 Add a cast method for entities, sometimes we know the type 2025-09-12 14:40:01 +03:00