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

24736 Commits

Author SHA1 Message Date
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
duncanspumpkin
aa0d3bcdd8 Update replays 2023-04-12 22:43:14 +01:00
OpenRCT2 git bot
126d6b091a Merge Localisation/master into OpenRCT2/develop 2023-04-12 04:01:59 +00:00
Spacek531
fdeb311ad3 remove redundant condition 2023-04-11 19:28:27 -07:00
Spacek531
433ef96a36 add changelog entry 2023-04-11 19:28:27 -07:00
Spacek531
033b189b7a bump network version 2023-04-11 19:28:27 -07:00
Spacek531
ba5627c544 load brake from parkfile 2023-04-11 19:28:26 -07:00
Spacek531
7fe9580131 vehicle chooses between brake speed and block brake speed 2023-04-11 19:28:26 -07:00
Spacek531
6488f0397e link brake open to block brake open 2023-04-11 19:28:26 -07:00
Spacek531
115fc957c0 import block brake from legacy file types 2023-04-11 19:28:26 -07:00
Spacek531
99ffaa8b71 allow block brakes to be built with speed 2023-04-11 19:28:17 -07:00
Spacek531
c57f0bd962 add strings 2023-04-11 18:05:51 -07:00
Matthias Moninger
1b62cd42ff Merge pull request #19818 from Gymnasiast/refactor/drawpixelinfo
Pass DrawPixelInfo by reference in most places
2023-04-12 02:43:03 +03:00
Gymnasiast
c1626a54bf Fix formatting 2023-04-11 22:59:03 +01:00
Gymnasiast
57c366e983 Fix rebase error 2023-04-11 22:59:03 +01:00
Gymnasiast
c3e5c83c92 Fix missed occurrence in BenchSpriteSort.cpp 2023-04-11 22:59:03 +01:00
Gymnasiast
2662518ff0 Fix formatting 2023-04-11 22:59:03 +01:00
Gymnasiast
91f4c1e752 Use dpi ref in misc drawing functions 2023-04-11 22:59:03 +01:00
Gymnasiast
bb83a80eab Use dpi ref in rect and line drawing functions 2023-04-11 22:59:01 +01:00
Gymnasiast
2941f6f7a5 Use dpi ref in misc drawing folder places 2023-04-11 22:57:25 +01:00
Gymnasiast
0139c8d19e Use dpi ref in everything outside the drawing folder 2023-04-11 22:57:25 +01:00
Gymnasiast
fc0e0d029a Use dpi ref in ui context and weather 2023-04-11 22:57:25 +01:00
Gymnasiast
16c5c1b752 Use dpi ref in interface folder 2023-04-11 22:57:25 +01:00
Gymnasiast
3e764677da Use dpi ref in paint folder 2023-04-11 22:57:25 +01:00