OpenRCT2 git bot
|
15ee7a244b
|
Merge Localisation/master into OpenRCT2/develop
|
2024-05-01 04:02:01 +00:00 |
|
Matt
|
409da62fe8
|
Merge pull request #21924 from Harry-Hopkinson/refactor-constants-TrackPaint.h
Refactor constants in TrackPaint.cpp
|
2024-04-30 16:51:18 +03:00 |
|
Big-Blue-1
|
e31bebbedf
|
Fix build errors with the ORIGINAL_RATINGS flag (#21937)
|
2024-04-30 10:15:11 -03:00 |
|
Michael Steenbeek
|
921860729b
|
Merge pull request #21850 from Gymnasiast/backport/brake-stuff
Small backport of changes for #15314
|
2024-04-30 13:57:37 +02:00 |
|
Harry-Hopkinson
|
dda8c3ecb2
|
Rename DiagBlockedSegments to kDiagBlockedSegments
|
2024-04-30 11:54:05 +00:00 |
|
Michael Steenbeek
|
44c442f832
|
Fix #21870: Demolishing flat ride in pause mode allows copies
|
2024-04-30 13:50:04 +02:00 |
|
Gymnasiast
|
938f3cd783
|
Bump network version
|
2024-04-30 13:41:24 +02:00 |
|
Gymnasiast
|
00618c79d2
|
Rename _currentBrakeSpeed2 to _currentBrakeSpeed
|
2024-04-30 13:39:49 +02:00 |
|
Gymnasiast
|
22e7ad598b
|
Default-initialise all fields of RideTypeDescriptor
|
2024-04-30 13:39:49 +02:00 |
|
Gymnasiast
|
dbbfc2f1d1
|
Create kMaximumBrakeSpeed
|
2024-04-30 13:39:49 +02:00 |
|
Michael Steenbeek
|
575cd756b3
|
Merge pull request #21930 from AaronVanGeffen/move-palette
Move remap palette internally
|
2024-04-29 22:55:15 +02:00 |
|
Aaron van Geffen
|
95239d75c9
|
Move UpdatePaletteEffects to Drawing.cpp
|
2024-04-29 18:14:09 +02:00 |
|
Aaron van Geffen
|
66cb4a1d81
|
Mark GlassPaletteIds static constexpr
|
2024-04-29 18:05:25 +02:00 |
|
Aaron van Geffen
|
25faa361ad
|
Rename to secondaryRemapPalette, tertiaryRemapPalette
|
2024-04-29 18:04:17 +02:00 |
|
Aaron van Geffen
|
dcc1a0627d
|
Move gPeepPalette, gOtherPalette to Drawing.Sprite.cpp
|
2024-04-29 18:01:39 +02:00 |
|
Michael Steenbeek
|
4de4f4a985
|
Merge pull request #21683 from duncanspumpkin/uiMove
Move a number of ui only updates into UiContext tick
|
2024-04-29 14:54:07 +02:00 |
|
duncanspumpkin
|
f6c34ddd59
|
Simplify map flashing flags and move into map
|
2024-04-29 14:10:53 +02:00 |
|
duncanspumpkin
|
4810a72232
|
Move a number of ui only updates into UiContext tick
|
2024-04-29 14:10:52 +02:00 |
|
Michael Steenbeek
|
5470a49382
|
Merge pull request #21925 from Gymnasiast/fix/10701
Fix two error messages when placing wall
|
2024-04-28 23:06:39 +02:00 |
|
Gymnasiast
|
de0ca4ded4
|
No reason specified when placing door off edge of map
|
2024-04-28 22:53:01 +02:00 |
|
Gymnasiast
|
6335906d03
|
Fix #10701: No explanation when placing door over unsuitable track
|
2024-04-28 22:53:01 +02:00 |
|
Michael Steenbeek
|
c02c7925c3
|
Close #21728: Apply "Fix all rides" even if mechanic is already working
Added checks for mechanic fixing plus handles inspecting and calling.
|
2024-04-28 22:20:19 +02:00 |
|
JDCustard
|
fe6da02718
|
Close #21728: Apply "Fix all rides" even if mechanic is already working
Added checks for mechanic fixing plus handles inspecting and calling.
|
2024-04-28 22:07:07 +02:00 |
|
Michael Steenbeek
|
21001be23d
|
Merge pull request #21922 from AaronVanGeffen/peep-refactor
Peep: split off UpdateWalkingAction, ThrowUp from UpdateAction
|
2024-04-28 21:45:24 +02:00 |
|
Aaron van Geffen
|
2d74287b4b
|
Guard for nullptr
|
2024-04-28 20:03:16 +02:00 |
|