1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Commit Graph

28318 Commits

Author SHA1 Message Date
matheusvb3
8dd7b7976f Prevent ride and stall statistics from overflowing (#24378)
* Prevent ride and stall statistic from overflowing

Clamps guestsFavourite, totalCustomers, lastInspection, totalProfit, numPrimaryItemsSold and numSecondaryItemsSold

* Change line of comment in Ride.h

This caused the tooltip with the comment to appear when hovering over notFixedTimeout instead of breakdownSoundModifier in Visual Studio

* Remove redundant overflow prevention

* Invalidate maintenance tab

Missed this before. Also fix an issue I inadvertently caused with PR #23719 when updating the count of vandals stopped

* Deduce lastInspection type in compile time

* Add changelog entry
2025-05-31 03:10:36 +03:00
OpenRCT2 git bot
e6ea31b7e9 Merge Localisation/master into OpenRCT2/develop 2025-05-30 04:03:39 +00:00
Michael Steenbeek
dea020fe7a Move TD46 stuff to own file 2025-05-30 00:04:52 +02:00
Michael Steenbeek
5088d60085 Merge pull request #24484 from Gymnasiast/refactor/split-g2-further
Split tracks.dat from g2.dat
2025-05-29 22:16:42 +02:00
Gymnasiast
c2b4158573 Split tracks.dat from g2.dat 2025-05-29 21:25:33 +02:00
Matt
fb834e64aa Merge pull request #24474 from Harry-Hopkinson/more-efficiently-search-viewports
Fix #24426: More efficiently search viewports.
2025-05-29 21:24:14 +03:00
Gymnasiast
2669ca3ba5 Build all graphics .dat in the same CI step 2025-05-29 20:19:13 +02:00
ZeeMaji
62cb4afd42 Fix #20095: UCES Cemetery Ridge swapped entrance/exit. (#24532)
* Fix UCES Halloween swapped ride huts

* Add cemetery ridge to scenario_to_hash

* Update changelog.txt

* Update data/scenario_patches/scenario_to_hash

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

---------

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2025-05-29 12:09:48 -03:00
Michael Steenbeek
ee25dcad7b Move oli414 to 'former team members'
Thanks for your hard work so far. You will be back :)
2025-05-28 13:53:12 +02:00
OpenRCT2 git bot
dbe42bd9ce Merge Localisation/master into OpenRCT2/develop 2025-05-28 04:03:51 +00:00
Aaron van Geffen
f64d5bb4a6 Implement OnLanguageChange event for ScenarioSelect window (#24519) 2025-05-28 00:31:43 +02:00
Matt
d2e3430df2 Add the ability to temporarily load objects without registering them (#24521) 2025-05-27 22:13:42 +00:00
Aaron van Geffen
a7b12594c8 Perform an additional name check for competition scenarios (#24518) 2025-05-27 22:14:54 +02:00
Harry-Hopkinson
2b19320db3 Remove unused function (WindowGetPreviousViewport) 2025-05-27 18:26:08 +00:00
mix
594ecf54ac Fix new ride window not always updating when searching (#24515) 2025-05-27 20:23:02 +02:00
Aaron van Geffen
4ef74c0f3a Fix object selection tabs (#24512)
Regression from c383a7778c (#24481)
2025-05-27 11:34:57 +02:00
Matt
34bf07915f Merge pull request #24504 from mixiate/fix-23289
Fix #23289: Dodgems and Flying Saucers can spawn on top of each other when opened
2025-05-26 16:43:08 +03:00
73
6bbb0e8348 Fix typo on VIEWPORT_FLAG_INDEPENDENT_ROTATION
This fixes a typo on a variable.
2025-05-26 12:05:13 +02:00
Harry Hopkinson
994cc858e8 More efficiently search viewports for playing Audio 2025-05-26 08:37:44 +01:00
Harry Hopkinson
371dcc28f5 More efficiently search viewports 2025-05-26 08:37:15 +01:00
Matt
5fe3f7b97f Merge pull request #24446 from Basssiiie/fix-plugin-track-segment-origin
[Plugin] Fix regression from #24142 breaking `ScTrackIterator` on specific track pieces
2025-05-26 02:38:41 +03:00
mix
7ee49d8f2b Fix #23289: Dodgems and Flying Saucers can spawn on top of each other 2025-05-25 21:37:58 +01:00
Bas
288513635c Fix include formatting in ScVehicle.cpp 2025-05-25 16:07:08 +02:00
Bas
cc45570379 Apply code formatting to ScVehicle.cpp 2025-05-25 16:07:07 +02:00
Bas
d14dffa9c4 Update changelog with #24446 2025-05-25 16:06:55 +02:00
Bas
711d162063 Fix moveToTrack() by applying segment 0 offset 2025-05-25 16:05:21 +02:00
Bas
cdc8218073 Revert '75de5b8: Fix track origin being miscalculated for plugins on downward slopes' 2025-05-25 16:05:21 +02:00
Michael Steenbeek
66aa54b3eb Merge pull request #24487 from Gymnasiast/refactor/news-queue
News queue refactors, part 2
2025-05-25 00:10:11 +02:00
Michael Steenbeek
6753c9f11b Translate NSIS installer 2025-05-25 00:08:51 +02:00
Gymnasiast
d2615beb6e Change News enums to use lowerCamelCase 2025-05-24 23:47:18 +02:00
Gymnasiast
47bb449e34 Make news item fields lowerCamelCase 2025-05-24 23:47:18 +02:00
Gymnasiast
323a3c9119 Pass std::span to convertNewsQueue 2025-05-24 23:47:18 +02:00
Michael Steenbeek
2656f3acc2 Eliminate direct ride type check 2025-05-24 14:52:54 +02:00
Matt
4873620043 Merge pull request #24488 from mixiate/invalidate-screen-on-object-reload
Invalidate screen on reload from object selection window
2025-05-24 14:27:24 +03:00
mix
25fc322825 Invalidate screen on reload from object selection window 2025-05-24 02:47:12 +01:00
Michael Steenbeek
bdd912e304 More code maintenance (#24482) 2025-05-23 20:33:26 +02:00
ζeh Matt
e40d56ed76 Avoid expensive copies calling ViewportSurfaceSmoothenEdge 2025-05-23 19:17:19 +03:00
ζeh Matt
d7b65d48ac Fix potential bug with missing 0 terminator 2025-05-23 19:16:25 +03:00
Matt
3bfecb236f Merge pull request #24481 from ZehMatt/code-fixes
Some code maintenance
2025-05-23 19:01:10 +03:00
ζeh Matt
c383a7778c Avoid some more unintentional copies 2025-05-23 18:33:44 +03:00
ζeh Matt
068880635c Add fallthrough 2025-05-23 18:31:27 +03:00
ζeh Matt
de0ad4f0f4 Add missing break statements 2025-05-23 18:31:18 +03:00
ζeh Matt
5702100fd9 Mark things constexpr that are actually constexpr 2025-05-23 18:28:23 +03:00
ζeh Matt
5749466e00 Don't copy the widget, use reference 2025-05-23 18:25:06 +03:00
ζeh Matt
374f17bac9 Default initialize members in ProgressWindow 2025-05-23 18:21:23 +03:00
ζeh Matt
5351d50f5a Fix dangling pointer for Discord rich presence 2025-05-23 18:12:51 +03:00
ζeh Matt
0cfeeb8aba Annotate fall-through 2025-05-23 18:12:34 +03:00
ζeh Matt
027f7c4096 Don't have garbage in padding for save header 2025-05-23 18:08:25 +03:00
Tulio Leao
b04348c56b Make error message on console set command more descriptive
Previously when using `set variable something` you would always get the non-helpful message: "set variable command failed, likely due to permissions."

Since all of these are going through game actions, we can use the GameActionResult to return something more meaningful. For example, trying to do `set game_speed 5`:
Before:
![image](https://github.com/user-attachments/assets/7e52143b-ca5d-461c-8475-408ba6346350)

After:
![image](https://github.com/user-attachments/assets/44160ceb-954b-41f6-80e3-fe581403b404)
2025-05-23 15:44:16 +02:00
Harry Hopkinson
cd63cd34d1 Close #24400: Sort rides with preservation order alphabetically 2025-05-23 12:48:06 +00:00