1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

25364 Commits

Author SHA1 Message Date
mrmbernardi
d233d0fc3d Remove double load of Title Sequence in TitleScreen.cpp 2023-12-29 20:49:25 +01:00
Michael Steenbeek
a4d11d82e8 Merge pull request #21113 from spacek531/track/replace-track-paint-scheme-enum
Refactor track and supports colours in PaintSessionCore
2023-12-26 14:13:48 +01:00
mrmbernardi
98a52efb7e Fix #5677: Balloons pass through the ground and objects (#20483) 2023-12-26 08:28:19 -03:00
matoro
191b0c4d6d Use __LP64__ for BitSet 64-bit blocksize conditional check
The canonical way to check for 64-bit system is __LP64__ preprocessor
define.  This allows to build and pass test suite on ppc64le.
2023-12-24 18:30:48 +01:00
Spacek531
b6bcb8e106 Add secondary colour to supports scheme
The wooden roller coaster and air powered vertical coaster both
construct a paint scheme that incorporates the tertiary colour in the
primary slot and the secondary colour in the secondary slot.
Constructing the scheme requires at least one condition that can be
removed by constructing the scheme when populating the PaintSessionCore.
2023-12-23 17:13:27 -08:00
Spacek531
a890844115 replace TrackColours array with two ImageId values 2023-12-23 17:01:56 -08:00
Michael Steenbeek
3ab12eb659 Update objects to v1.3.12 2023-12-23 23:38:33 +01:00
spacek531
1306dc048b Remove SCHEME_MISC, SCHEME_3 from PaintSessionCore 2023-12-23 16:42:00 +01:00
Matt
2147b69104 Update the money effect even when the game is paused (#21102)
* Update the money effect even when the game is paused

* Update changelog.txt
2023-12-23 11:04:25 -03:00
Michael Steenbeek
c15391fbff Fix #21106: 25-deg-down 3x3 right turns rendered incorrectly 2023-12-23 14:03:23 +01:00
OpenRCT2 git bot
689d16b501 Merge Localisation/master into OpenRCT2/develop 2023-12-23 04:01:35 +00:00
Michael Steenbeek
268eef2cf1 Consolidate Junior and Water RC track code 2023-12-23 01:54:43 +01:00
Matt
5bd5273875 Merge pull request #20541 from ZehMatt/ci-changelog
Add CI validation for the changelog.txt
2023-12-23 02:25:02 +02:00
ζeh Matt
7a54dcce9b Fix the changelog.txt 2023-12-23 01:34:34 +02:00
ζeh Matt
a927335f8a Update CI workflow 2023-12-23 01:34:28 +02:00
ζeh Matt
8d7db5e987 Add script to format changelog 2023-12-23 01:34:28 +02:00
Matt
5fa955e1b3 Merge pull request #21101 from ZehMatt/update-changelog
Update changelog.txt based on changelog-format
2023-12-23 01:16:22 +02:00
Max
895095acb9 Fix #12299 Placing ride entrances/exits ignores the Disable Clearance Checks cheat (#21096) 2023-12-21 20:38:20 +01:00
ζeh Matt
70b12b3d15 Update changelog.txt based on changelog-format 2023-12-21 15:24:14 +02:00
OpenRCT2 git bot
b7bf844659 Merge Localisation/master into OpenRCT2/develop 2023-12-21 04:01:53 +00:00
Michael Steenbeek
c32a049adb Re-add myself to the development team 2023-12-20 15:42:27 +01:00
OpenRCT2 git bot
89472a55ae Merge Localisation/master into OpenRCT2/develop 2023-12-20 04:01:36 +00:00
Fredrik Tegnell
3f5d4b8941 Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window (#21058)
* Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window

* Apply code formatting fixes

* Apply code formatting fixes

* Fix code review changes
2023-12-19 21:15:04 -03:00
AuraSpecs
bd4b39ed8a Add Code of Conduct (#21087) 2023-12-19 00:23:58 +00:00
Michael Steenbeek
9dd5fd8d98 Update support drawing for thrill rides and water rides (#21007)
* Update support drawing for thrill rides and water rides

* Consolidate support drawing calls for Go Karts
2023-12-18 07:38:25 -03:00
OpenRCT2 git bot
a467be257b Merge Localisation/master into OpenRCT2/develop 2023-12-16 04:01:37 +00:00
73
573ab043d6 Fix #13473: Lower Circus default price to avoid instant guest complaint (#21056)
From 1.50 to 1.20
2023-12-15 06:15:31 -03:00
Ted John
35a690bfa4 Merge pull request #21009 from Gymnasiast/refactor/covered-drawers
Split up drawing functions for covered track elements
2023-12-13 23:35:51 +00:00
Gymnasiast
a19250c5be Remove now-redundant code in WaterCoaster.cpp
More consolidation is possible (by making JuniorRollerCoaster.cpp use a template like BolligerMabillardTrack.hpp), but probably best left for another PR.
2023-12-13 23:03:38 +01:00
ZeeMaji
ac3ab7e1d2 Fix #20311: Restore removed coaster colour presets (#20880)
* Restore removed coaster colour presets

* Update changelog entry

* Add lost purple impulse preset

* Add lost yellow and red presets to impulse

* Fix typo in purple impulse preset

* Remove accidentally included hairpin presets from impulse
2023-12-12 07:15:00 -03:00
OpenRCT2 git bot
09cf5b37d2 Merge Localisation/master into OpenRCT2/develop 2023-12-12 04:01:38 +00:00
Gymnasiast
5e38c15f58 Split up drawing functions for covered track elements 2023-12-10 15:11:46 +01:00
mrmbernardi
4b0b2a48f6 Fixed shader formatting in applytransparency.frag (#21071) 2023-12-09 18:42:41 +00:00
mrmbernardi
5b42da2646 Add clang format for shaders (#21066) 2023-12-08 13:02:43 +01:00
mrmbernardi
042d555d9a Merge pull request #21038 from mrmbernardi/opengl-text
Improve OpenGL TTF rendering
2023-12-08 01:28:22 +01:00
Michael Bernardi
8c7d1d149a Added OpenGL TTF hinting 2023-12-08 01:13:17 +01:00
Michael Bernardi
f64706e1d9 Add insetting and outlining to OpenGL TTF rendering 2023-12-08 01:13:17 +01:00
spacek531
6162ff9b00 Replace TrackElemType::Booster reference with TrackTypeIsBooster() (#21044) 2023-12-06 08:18:41 -03:00
Michał Janiszewski
004592b587 Make download_openrct2_zip cmake function more verbose (#21036) 2023-12-03 07:43:45 -03:00
spacek531
ccb3fa172c Add TrackTypeIsBooster method (#21033) 2023-12-02 14:53:16 -03:00
Michael Steenbeek
baf88ef490 Refactor in-memory track design element (#21010) 2023-12-02 14:43:03 -03:00
Matt
ee5055a422 Merge pull request #20998 from felixonmars/patch-1
Update Arch Linux package URL in readme.md
2023-11-28 21:07:21 +02:00
AuraSpecs
83598ba898 OpenMusic release v1.5 (#21004)
Adds Rock style 4 ride music by Blackend Blue.
2023-11-28 06:09:58 -03:00
Matt
4361827e42 Merge pull request #21008 from ZehMatt/dynamic-initialziers
Remove about 13763 redundant functions from binary
2023-11-26 18:02:57 +02:00
ζeh Matt
19f09dae14 Refactor PlatformEnvironment to avoid static initialization 2023-11-25 16:58:28 +02:00
ζeh Matt
62c0bc2cf5 Remove 13k dynamic initializer by changing SpriteGroupNames type 2023-11-25 16:22:45 +02:00
Felix Yan
5acfe3380d Update Arch Linux package URL in readme.md
The old URL returns 404 now.
2023-11-21 09:19:03 +02:00
mrmbernardi
efea009ed5 Fix #20624: Clear scrolling text cache on language change (#20993) 2023-11-20 22:31:35 +00:00
mrmbernardi
1fcfb1c578 Fix #20618: ignore tasks.json in .gitignore 2023-11-20 23:09:22 +01:00
Michael Bernardi
90fddb99ed Fix #20618: ignore tasks.json in .gitignore 2023-11-19 22:51:43 +01:00