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

29599 Commits

Author SHA1 Message Date
matheusvb3
20f8339963 Convert car entry flags into a FlagHolder (#25784) 2026-01-29 22:00:03 +01:00
frozensnowy
560fb471e0 Fix #25775: Network download sizes are not in the claimed KiB 2026-01-29 21:43:05 +01:00
OpenRCT2 git bot
5b40d5b857 Merge Localisation/master into OpenRCT2/develop 2026-01-29 04:29:56 +00:00
Michael Steenbeek
343c7a70d7 Change colour to a strong enum (#25873) 2026-01-28 10:06:45 +01:00
OpenRCT2 git bot
bc0f2e8539 Merge Localisation/master into OpenRCT2/develop 2026-01-28 04:17:59 +00:00
Gymnasiast
78f8974c62 Add "original bug" to issue #18441
[ci skip]
2026-01-27 23:33:34 +01:00
Michael Steenbeek
6bc432dd12 Fix #18441: Spurious error when trying to replace footpath (#25880) 2026-01-27 22:47:19 +01:00
Michael Steenbeek
7aaa124cef Fix #15009: Landscaping tools do not display estimates when paused (#25866) 2026-01-27 22:09:33 +01:00
OpenRCT2 git bot
545d269295 Merge Localisation/master into OpenRCT2/develop 2026-01-27 04:19:10 +00:00
Michael Steenbeek
efaa5586d3 Merge pull request #25872 from Gymnasiast/backport/refactor-ride-ratings
Backport some things from #23179
2026-01-25 21:01:26 +01:00
Nick Peters-Luciani
3512cef39a Extract TrackGetIsSheltered() 2026-01-25 13:39:51 +01:00
Tulio Leao
5485ae4bde Extract kDynamicRideShelterRating constant 2026-01-25 13:39:51 +01:00
Aaron van Geffen
e6fa0e48d0 Rework palette information into palettes.dat (#25681)
* Rework all palette information into new palette.dat

* Harmonise order between sprites.json, SpriteIds.h, kPaletteToG1Offset

* Rename G1 counterparts for completeness/documentation

* Bump libsawyer to v1.4.0
2026-01-25 10:39:18 +01:00
Michael Steenbeek
fa72aaf6b2 Merge pull request #25868 from Gymnasiast/refactor/colour-h
Remove more stuff from Colour.h
2026-01-24 18:33:41 +01:00
Gymnasiast
27b5c8d44e Deduplicate water colour names 2026-01-24 17:17:13 +01:00
Gymnasiast
491f90b67a Replace kTextColour254 and kTextColour255 with COLOUR_NULL 2026-01-24 16:54:44 +01:00
Gymnasiast
96e349645c Move left palette index constants out of Colour.h 2026-01-24 16:50:09 +01:00
matheusvb3
182b5c65dd Add "use bool literals" rule to .clang-tidy (#25842) 2026-01-24 10:12:30 +01:00
Michael Steenbeek
14d4fe362e Merge pull request #25862 from MarcelVos96/booster-running-cost
Fix #25018: Add upkeep cost to booster pieces
2026-01-24 00:27:18 +01:00
Gymnasiast
0343d721e3 Fix: diagonal and inclined brakes not counted when calculating upkeep cost 2026-01-24 00:06:26 +01:00
MarcelVos96
716e3c92ab Add running cost to boosters 2026-01-24 00:06:26 +01:00
matheusvb3
dcba4cb099 Remove redundant namespaces qualifiers (#25837) 2026-01-23 21:46:08 +00:00
Michael Steenbeek
bb16feda8a Merge pull request #25858 from MichaelJBerk/macos-optionsWindow
Add support for native options dialog on macOS and add Quit button to onboarding
2026-01-22 23:41:46 +01:00
Gymnasiast
dcd097a3b1 Fix minimum height of Zenity/Kdialog window to 350 pixels 2026-01-22 20:59:24 +01:00
Gymnasiast
639c64974f Fix #25221: When trying to cancel game file discovery, the prompt reappears 2026-01-22 20:59:24 +01:00
Michael Berk
17533dae34 Add quit button to onboarding options 2026-01-22 20:59:24 +01:00
Michael Berk
f8805635f6 Implement ShowMenuDialog on macOS 2026-01-22 20:59:24 +01:00
OpenRCT2 git bot
96e3cd2a22 Merge Localisation/master into OpenRCT2/develop 2026-01-22 04:20:27 +00:00
matheusvb3
0f448cbe71 Add Kate temporary files to .gitignore (#25856) 2026-01-21 23:29:34 +01:00
MarcelVos96
b6922173b5 Fix #25854: Game draws too much bar at 0 happiness and energy (#25855)
* Update changelog.txt

* Fix #25854: Game draws too much bar at 0 happiness and energy

Fixes #25854

Originally the minimum for happiness was 10/255. It was changed to 10/100, and this PR changes it to 3/100 to get back to the old minimum.

* Update changelog.txt
2026-01-21 07:37:22 +00:00
Duncan
8d25776c95 Fix implementation mistake from #1644. Guest happiness calcs (#25850)
* Fix implementation mistake from #1644. Guest happiness calcs

There was meant to be happiness growth rate penalties when very hungry, thirsty, low energy, high toilet

* Fix regression

* Fix nausea growth generation

* No really fix it

* Add changelog entry

* Change issue number

* Bump network version

* Update replays
2026-01-20 19:47:24 +00:00
Michael Steenbeek
b8d9fa58c8 Merge pull request #25851 from Gymnasiast/refactor/name-water-object-fields
Move BlendColourMap to own file, name Water Object palette indices
2026-01-19 11:37:23 +01:00
Gymnasiast
626f70ad66 Move BlendColourMap to its own file 2026-01-18 23:35:39 +01:00
Gymnasiast
7909c889e9 Name palette fields in Water object 2026-01-18 23:06:13 +01:00
Michael Steenbeek
3e4261323a Rename some palette indices (#25843) 2026-01-18 21:24:45 +00:00
Michael Steenbeek
795cdaa53e Fix #23636: Mismatched entity count in save file (#25731)
This is based on #24552, with two changes:
1. The entity list is copied and used for both the count and the actual writes
2. It no longer asserts if the count mismatches (which is why #24552 was not merged).

Co-authored-by: ZehMatt <ZehMatt@users.noreply.github.com>
2026-01-18 14:18:44 +01:00
Michael Steenbeek
e9bde4dae9 Merge pull request #25844 from Gymnasiast/refactor/json-in-sprite
Allow importing palettes in `sprite build`
2026-01-18 00:13:20 +01:00
Gymnasiast
c254c2e9f8 Improve error messages, add changelog entry 2026-01-17 23:44:37 +01:00
Gymnasiast
e527ef8e26 Allow importing palettes in sprite build 2026-01-17 20:30:36 +01:00
Gymnasiast
9d7a0a167d Move importing JSON palettes to ImageImporter 2026-01-17 20:24:47 +01:00
Michael Steenbeek
e22d3f4605 Merge pull request #25815 from Gymnasiast/refactor/palette-renames
Move ColourMap to its own file
2026-01-17 19:17:15 +01:00
Gymnasiast
6ec4c80e59 Remove commented-out code from Themes.cpp 2026-01-17 18:46:54 +01:00
Gymnasiast
e46d2eba9e Move colour map to its own file 2026-01-17 18:46:54 +01:00
Michael Steenbeek
1ddb38dd07 Merge pull request #25830 from Gymnasiast/refactor/palette-renames-b
Refactor palette member names
2026-01-17 17:46:21 +01:00
Michael Steenbeek
d2969183c5 Merge pull request #25832 from matheusvb3/final-solution
Remove last redundant const qualifiers and integers being used as booleans
2026-01-17 17:05:26 +01:00
matheusvb3
06d7ed1d4e Remove redundant const qualifiers 2026-01-16 19:35:29 -03:00
matheusvb3
f75c5035d5 Refactor maze import 2026-01-16 19:35:28 -03:00
Gymnasiast
bd75214491 Add missing copyright header to ColourPalette.h 2026-01-16 19:30:12 +01:00
Gymnasiast
04a3d02023 Rename members of ColourShadeMap 2026-01-16 19:25:58 +01:00
Gymnasiast
7de4dcd675 Rename PaletteBGRA and its members 2026-01-16 19:25:24 +01:00