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

22469 Commits

Author SHA1 Message Date
Michael Steenbeek
3e11a8efdf Fix #24998: Some custom small scenery objects do not load 2025-09-23 14:06:20 +02:00
Gymnasiast
73d3e4f0e3 Change "sprite exportalldat" into "sprite exportobject", take a filename instead of an already loaded DAT 2025-09-21 21:18:59 +02:00
Gymnasiast
161a8359fc Create function to create object from file 2025-09-21 21:18:22 +02:00
Aaron van Geffen
db5f56f4aa Scripting: order available costumes array by display name (#25228) 2025-09-21 15:31:36 +00:00
matheusvb3
72c6908cf0 Check if we're in shop tab before drawing track design info 2025-09-21 17:06:12 +02:00
Michael Steenbeek
eb38b7227f Change WindowFlag to strong enum 2025-09-20 21:46:42 +02:00
matheusvb3
f60dac165f Don't print the trailing comma in sprite exportalldat JSON output 2025-09-20 13:35:53 +02:00
spacek531
e5aa3b33f2 Use regular interval for swing sprite threshold (#25171)
* use regular interval for swing sprite threshold

* bump network

* bump park file version
2025-09-20 09:39:50 +02:00
Aaron van Geffen
80badee58d Skip drawing accessories whilst peep is clapping 2025-09-20 00:11:47 +02:00
Michael Steenbeek
77d330a004 Merge pull request #25205 from Gymnasiast/refactor/more-code-style-b
Refactor more UI code style
2025-09-19 16:15:30 +02:00
Aaron van Geffen
1d956b6dfb Pass ParkData& to scenario objective checks (#25209) 2025-09-19 12:51:17 +02:00
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
Gymnasiast
aab21c4747 Rename validate_global_widx to VALIDATE_GLOBAL_WIDX 2025-09-17 23:50:28 +02:00
Gymnasiast
472e048f69 Make WindowView into strong enum 2025-09-17 23:49:17 +02:00
Gymnasiast
ea5fc03dd0 Turn WindowDetail into strong enum 2025-09-17 23:35:10 +02:00
Gymnasiast
a662c5ef8e Change WindowClass members to use lowerCamelCase 2025-09-17 23:18:52 +02:00
Gymnasiast
c94babb06e Rename g_window_list to gWindowList 2025-09-17 23:16:17 +02: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
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
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
Gymnasiast
a0a4a7823a Amend changelog, bump network and park file versions 2025-09-15 23:12:13 +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
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
Aaron van Geffen
b869134e72 Finance: remove pre-gamestate accessor functions 2025-09-12 12:46:24 +02:00
Aaron van Geffen
531cb68727 RideManager: use explicit game state rather than using implicit global 2025-09-11 13:42:18 +02:00
Aaron van Geffen
37e143565b Park: pass ParkData& and GameState_t& refs down 2025-09-11 13:41:58 +02:00
Aaron van Geffen
f6e4d5a90d ScenarioObjective: pass GameState_t& down to check functions 2025-09-11 13:37:53 +02:00
Aaron van Geffen
76256684aa Park: remove unused forward declarations 2025-09-11 13:32:49 +02:00
Aaron van Geffen
9853290001 Award: pass GameState_t down to checks; use RideManager directly 2025-09-11 12:48:21 +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