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

24809 Commits

Author SHA1 Message Date
Rik Smeets d10be6d0e7
Fix #19911: Guests stuck at railway crossings (#19939) 
In continuous circuit operating mode, not only the train head should be used for (un)blocking path. Because of this change, a previous change regarding which trailing track blocks should be unblocked has been reverted, as to prevent path being unblocked too soon.
 2023-04-20 18:53:21 +02:00
Gymnasiast 33bd5c494f
Introduce normalised Wooden A supports functions 2023-04-20 18:35:58 +02:00
Matthias Moninger e614584f65
Fix #19991: Crash when using cut-away view (#19968) 
* Fix #19991: Crash using cut-away view

* Update changelog.txt

* Document the use of temporary paint head
 2023-04-20 16:00:22 +01:00
OpenRCT2 git bot f7bd96fbbf Merge Localisation/master into OpenRCT2/develop 2023-04-20 04:02:08 +00:00
Gymnasiast 809e172a84
Fix Mine Train support bug (original bug) 2023-04-19 16:22:08 +02:00
Matthias Moninger 98aa816e5f
Fix #19989: Crash with small scenery objects having no offsets defined (#19990) 2023-04-19 06:35:09 +01:00
Ted John d471d7a4b7 Use strings for research category 2023-04-18 21:38:10 +01:00
Ted John 83bf0d7dce Make expectedDay in plugin in 1 to 31 range. 2023-04-18 21:38:10 +01:00
Ted John 00eb2aae95 Move uninvented item to invented list when research is complete 
When an item began initial research, it was moved to the invented list. This is not intuitive for plugins, so move it once the item is fully researched.
 2023-04-18 21:38:10 +01:00
Ted John fe3f32e82e Fix code review comments on research 2023-04-18 21:38:10 +01:00
Ted John 59f9d099b9 Update openrct2.d.ts 2023-04-18 21:38:10 +01:00
Ted John aa3f8957bd Use enum for research item category 2023-04-18 21:38:10 +01:00
Ted John dc8187d949 Update changelog 2023-04-18 21:38:09 +01:00
Ted John f35e595d0e Add research plugin API 2023-04-18 21:38:09 +01:00
Stephan Spengler 2fd3eb47e7
SetCheatAction has wrong ID in plugin API 2023-04-18 13:23:44 +02:00
OpenRCT2 git bot c0660f00ba Merge Localisation/master into OpenRCT2/develop 2023-04-18 04:01:58 +00:00
Hielke Morsink 2e3cb6a106
Fix: version info is not filled on bug report 2023-04-17 21:25:05 +02:00
Matthias Moninger 1ecdfb68ee
Set NextQuadrantEntry not to null (#19969) 2023-04-17 18:18:43 +01:00
Tulio Leao f5d9d00fba
Merge pull request #19958 from Gymnasiast/refactor/wooden-a-b 2023-04-17 10:58:33 -03:00
Rik Smeets 35674ac627
Add Spiral Slide pallette (#19952) 2023-04-17 09:49:30 +00:00
Rik Smeets 55adb71cd8
Add keyboard shortcut to Keyboard Shortcuts window 2023-04-17 11:15:32 +02:00
OpenRCT2 git bot e832159f35 Merge Localisation/master into OpenRCT2/develop 2023-04-17 04:02:05 +00:00
Gymnasiast f773bc9471
Break out some common code in WoodenA and WoodenB paint setup 2023-04-16 20:26:59 +02:00
Gymnasiast 235dc0fe92
Remove stylistic diff between WoodenA and WoodenB paint setup 
Removes the differences in variable names, comments, order of assignment. There should be no functional difference.
 2023-04-16 20:02:42 +02:00
Matthias Moninger e88d606925
Merge pull request #19888 from ZehMatt/cleanup-paint 
Refactor paint sort code
 2023-04-16 17:20:43 +03:00
Michael Steenbeek 812ea151bb
Fix duplicate RGB colours in palette (#18299) 
* Remove duplicate RGB colours from palette

* Update hash

* Update reference dat file

---------

Co-authored-by: Spacek531 <spacek531@comcast.net>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-04-16 15:15:26 +01:00
ζeh Matt fc7fa91d2f
Remove atomic include and use array for arrange functions 2023-04-16 16:58:15 +03:00
ζeh Matt cf64bba0b7
Add more comments 2023-04-16 16:55:40 +03:00
73 7011a9775c
fix #19858 (#19940) 
this will fix issue 19858 by changing water colour used in simulate flag to nonwater colour
 2023-04-16 14:27:20 +01:00
Michael Steenbeek d088533ac4
Fix #19950: Mine train block brake supports drawn incorrectly (#19954) 2023-04-16 14:19:17 +01:00
Rik Smeets a31ff7e02e
Add prompt before resetting shortcut keys (#19905) 2023-04-16 09:22:05 +00:00
spacek531 319d759d71
fix TrackData.cpp (#19922) 2023-04-16 09:28:56 +01:00
OpenRCT2 git bot 09bdd50280 Merge Localisation/master into OpenRCT2/develop 2023-04-16 04:02:01 +00:00
Duncan 383642a812
Fix #19916. Crash when changing language (#19945) 
Issue caused by the unload image function not resetting the image id back to invalid. Also noticed that water wasn't correctly cleaning up.

Fix #19918, #19926, #19927, #19928, #19929, #19931
 2023-04-15 21:11:01 +00:00
Chase 7e313d45cd
Fix #19906: Destructible cheat does not allow ride modification (#19924) 2023-04-14 21:10:54 -03:00
Kevin Strehl f7b8a2fde7
Disable marketing tab when marketing is prohibited (#19828) 
Disable marketing tab when marketing is prohibited

---------

Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
 2023-04-14 18:25:35 +02:00
OpenRCT2 git bot 60ac375e31 Merge Localisation/master into OpenRCT2/develop 2023-04-14 04:01:43 +00:00
ζeh Matt a1c3f38469
Rename next to NextEntry 2023-04-14 03:37:26 +03:00
ζeh Matt b78a1ac9f2
Use ScreenCoordsXY for PaintStringStruct 2023-04-14 03:27:07 +03:00
ζeh Matt d35933dc9f
Use ScreenCoordsXY in AttachedPaintStruct 2023-04-14 03:22:32 +03:00
ζeh Matt fc75f8b0e9
Use ScreenCoordsXY, refactor uses 2023-04-14 03:14:37 +03:00
ζeh Matt 31e1a5dbcd
Use CoordsXY for map position 2023-04-14 03:09:29 +03:00
ζeh Matt 5ea09be0f8
Rename some fields in PaintStruct 2023-04-14 03:06:53 +03:00
ζeh Matt 63d15c71ae
Refactor paint sort 2023-04-14 02:35:59 +03:00
Nikolas Parshook ef35dfa40a
Expose obj image offset and num images to plugins (#17567) 
Co-authored-by: Duncan <duncans_pumpkin@hotmail.co.uk>
 2023-04-13 19:09:15 +00:00
Tulio Leao d0c7d0f6fb
Close #18318: Refactor MapTooltip window to class (#19914) 2023-04-13 14:16:14 -03:00
undermark5 78aa02fe8a
Fix #13130: Android respects device locale (#19419) 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2023-04-13 09:30:18 +00:00
Wenzhao Qiu 0a28f6b0b9
Close #18316: Refactor GameBottomToolbar window to class (#19896) 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2023-04-13 06:13:12 -03:00
OpenRCT2 git bot bb53ba10f6 Merge Localisation/master into OpenRCT2/develop 2023-04-13 04:01:56 +00:00
Hielke Morsink 5c34d1d7b9
Merge pull request #18713 2023-04-13 00:03:00 +02:00