mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,606 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

25606 Commits

Author SHA1 Message Date
HtotheTML 43b9ffb2b8
Fix park boundaries for out-of-bounds monorails in Africa - Oasis & Blackpool Pleasure Beach (#21309) 2024-02-02 07:54:27 -03:00
OpenRCT2 git bot 328c397718 Merge Localisation/master into OpenRCT2/develop 2024-02-02 04:02:02 +00:00
Michael Steenbeek 22715852f5
Merge pull request #21279 from Gymnasiast/refactor/hybrid-stuff 
Use new WoodenASupportsPaintSetup() overloads for Hybrid Coaster
 2024-02-02 00:03:09 +01:00
Michael Steenbeek f2862861ce
Merge pull request #21305 from Gymnasiast/refactor/path-support-drawing 
Refactor path support drawing
 2024-02-01 12:54:27 +01:00
Michael Steenbeek 40c7e73189
Render selection grid for Map ownership on the water 2024-02-01 10:30:33 +01:00
HtotheTML a377538f0a
Add missing owned land in Extreme Hawaiian Island (#21316) 
* Update S6Importer.cpp

* Update changelog.txt
 2024-02-01 06:22:31 -03:00
OpenRCT2 git bot 13fc351591 Merge Localisation/master into OpenRCT2/develop 2024-02-01 04:01:39 +00:00
OpenRCT2 git bot 8abda17cb3 Merge Localisation/master into OpenRCT2/develop 2024-01-31 04:01:41 +00:00
wstagg 4a51e7f362
Fix #20631: IME window not positioned correctly 2024-01-30 23:44:58 +01:00
Gymnasiast 0196606851
Apply review requests 2024-01-30 22:00:53 +01:00
Gymnasiast 295671ef8c
Fix formatting 2024-01-30 21:57:03 +01:00
Gymnasiast 702113bb23
Extract PathPaintSlopedFences() 2024-01-30 21:57:03 +01:00
Gymnasiast 77048ffb7c
Split up PathPaintFencesAndQueueBanners() 2024-01-30 21:57:03 +01:00
Gymnasiast 97fb10ceb1
Refactor signatures of Path{Box,Pole}SupportsPaintSetup() 2024-01-30 21:57:03 +01:00
Gymnasiast 17f5f38191
Rename Path{A,B}SupportsPaintSetup() 2024-01-30 21:57:03 +01:00
Gymnasiast c19cfd201c
Extract PathPaintGetBaseImage() 2024-01-30 21:57:03 +01:00
Gymnasiast 706ef61e04
Extract PathPaintGetRotatedEdgesAndCorners() 2024-01-30 21:57:03 +01:00
Gymnasiast 64abf72fa2
Extract PathPaintGetBoundbox() 2024-01-30 21:57:03 +01:00
Gymnasiast d60e205f77
Consolidate PathPaintSegmentSupportHeight() 2024-01-30 21:57:03 +01:00
Michael Steenbeek ceafb68481
Actually pass in a reference to ImportResearchList() (#21308) 2024-01-30 09:20:31 +01:00
Tulio Leao fbe563c836
Merge pull request #21304 from Gymnasiast/refactor/gresearch-to-gamestate 
Move gResearch* globals to GameState_t
 2024-01-29 20:03:31 -03:00
Gymnasiast 8208afe5f6
Move gResearch* globals to GameState_t 2024-01-29 21:36:04 +01:00
Gymnasiast eb99798f4b
Fix typo in changelog 2024-01-29 21:01:30 +01:00
Matt fc1b580074
Merge pull request #21244 from pfroud/add-error-strings 
Add error strings to reduce how many `GameActions::Result`s have `STR_NONE, STR_NONE`
 2024-01-29 18:02:37 +02:00
Severin Paul Höfer 89094cad0d
Fix #21290: Sound keeps playing when paused from fast-forward mode (#21301) 
* Stop additional calls to UpdateLogic after pausing

* Update changelog.txt
 2024-01-29 15:35:28 +01:00
Peter Froud a382e4be8a Use `VALUE_OUF_OF_RANGE` for `spriteId` checks 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:50:52 -08:00
Peter Froud 21bda5e5e4
Use `TILE_ELEMENT_NOT_FOUND` 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:17:56 -08:00
Peter Froud 01d9eeb266 `INVALID_PARAMETER` for `GHOST_ELEMENT_NOT_FOUND` 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:15:53 -08:00
Peter Froud 704c779bf2 Format code which was committed on github.com 2024-01-29 02:15:27 -08:00
Peter Froud 7bb8fd7131
Add `INVALID_PARAMETER` for `GHOST_ELEMENT_NOT_FOUND` 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-28 21:27:35 -08:00
Severin Paul Höfer 704333344e
Fix #21291: Wrong conditions for hungry guests warning 
In `PeepProblemWarningsUpdate()`, when determining the number of hungry guests that need help (in order to check whether the threshold for showing the warning about hungry guests is reached), guests that are heading towards any flat ride (checked using the `RIDE_TYPE_FLAG_FLAT_RIDE` on the ride the guest is heading to (if any)) are discarded.  
For thirsty guests (and those needing to go to the toilet) on the other hand, the more specific `RIDE_TYPE_FLAG_SELLS_DRINKS` (or `RIDE_TYPE_FLAG_IS_TOILET`) is used. (So, a guest that becomes thirsty while on its way to the merry-go-round would count for the threshold here.)

This PR makes the function use the more specific `RIDE_TYPE_FLAG_SELLS_FOOD` for hungry guests, so it's consistent with the other cases.
 2024-01-28 23:35:17 +00:00
HtotheTML be9970b274
Fix additional missing land/construction rights tiles in WW's Inca Lost City & Renovation 2024-01-28 23:46:50 +01:00
Harry Hopkinson 11ae8247bd
Move gNumGuestsInPark to GameState_t (#21295) 
* Move gNumGuestsInPark to GameState_t

* Replace GetGameState() with gameState
 2024-01-28 19:17:43 -03:00
Michael Steenbeek 396af1f34c
Fix #19494: RCT1 sloped gates not imported correctly 2024-01-28 14:56:38 +01:00
Michael Steenbeek 8dd5014bc4
Move gStaff* globals to GameState_t (#21285) 2024-01-28 07:58:02 -03:00
Michael Steenbeek 22e73325d9
Remove bionic CI (#21284) 
It recently starting failing on every commit. Bionic is also out of support, so not much point in keeping it around anyway.
 2024-01-28 07:30:13 -03:00
Harry Hopkinson 01eecbaeba
Move gNumGuestsHeadingForPark to GameState_t (#21277) 
* Move gNumGuestsHeadingForPark to GameState_t

* Format code

* Remove change to contributors list

* Revert new line addition
 2024-01-28 07:26:22 -03:00
Michael Steenbeek 2059b50f44
Small change to error message 2024-01-28 00:06:54 +01:00
Harry Hopkinson a14d471530
Add RCTC Booster offsets into sprites.json 
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2024-01-26 09:37:00 +01:00
Michael Steenbeek 73183f6736
Merge pull request #21268 from pfroud/use-STR_OFF_EDGE_OF_MAP 
Change error messages to `STR_OFF_EDGE_OF_MAP` when `!LocationValid()`
 2024-01-26 09:34:33 +01:00
Michael Steenbeek 32aa3f56b4
Move gScenarioRand to GameState_t 2024-01-26 09:19:45 +01:00
Gymnasiast 83e4fc0d0f
Replace ToUint32() call in HybridCoaster.cpp 2024-01-25 20:53:35 +01:00
Gymnasiast 2d2fd03fc7
Use new WoodenASupportsPaintSetup() overloads for Hybrid 2024-01-25 20:33:42 +01:00
Michael Steenbeek 3f83cad03a
Close #21184: Draw selection square on water 2024-01-25 18:57:46 +00:00
Matt bf4f82da07
Merge pull request #21276 from ZehMatt/fix-21188 
Fix using iterators that are deleted by the plugin
 2024-01-25 18:46:51 +02:00
Hielke Morsink f9870ece7a
Merge pull request #21271 from Broxzier/refactor/global-park-value 
#21193: Move gParkValue and gParkValueHistory to GameState_t
 2024-01-25 16:14:23 +01:00
ζeh Matt cc64a17642
Skip intervals that are deleted within callbacks 2024-01-25 17:13:25 +02:00
Matt faccd5f14a
Merge pull request #21272 from Broxzier/refactor/global-park-entrances 
#21193: Move ParkEntrances to GameState_t
 2024-01-25 17:07:19 +02:00
ζeh Matt 84213efde2
Fix using iterators that are deleted by the plugin 2024-01-25 17:01:00 +02:00
Matt 49ff5a1826
Merge pull request #21275 from ZehMatt/fix-21274 
Fix #21274: Collision of PeepId when importing SV4
 2024-01-25 16:58:51 +02:00