1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Commit Graph

26134 Commits

Author SHA1 Message Date
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
Harry-Hopkinson
52ad6861af Rename track_map_1x4 to kTrackMap1x4 2024-04-28 14:33:41 +00:00
Harry-Hopkinson
d6efe4cd53 Rename edges_4x4 to kEdges4x4 2024-04-28 14:31:29 +00:00
Harry-Hopkinson
b9003d6e60 Rename track_map_4x4 to kTrackMap4x4 2024-04-28 14:26:12 +00:00
Harry-Hopkinson
8eebcc5486 Rename edges_3x3 to kEdges3x3 2024-04-28 14:19:19 +00:00
Harry-Hopkinson
a3e685bf1f Rename track_map_3x3 to kTrackMap3x3 2024-04-28 14:14:58 +00:00
Harry-Hopkinson
97e9634a61 Rename edges_2x2 to kEdges2x2 2024-04-28 14:08:02 +00:00
Harry-Hopkinson
b795d4ba8a Rename track_map_2x2 to kTrackMap2x2 2024-04-28 14:04:26 +00:00
Aaron van Geffen
f5f31496db Peep: split off UpdateWalkingAction, ThrowUp from UpdateAction 2024-04-28 15:57:50 +02:00
Aaron van Geffen
d35d08e86a Use named constants in Peep::Paint 2024-04-28 14:40:19 +02:00
Harry Hopkinson
9266a6f0d3 Remove duplicate sprite_map in TrackPaint.cpp 2024-04-27 21:13:22 +02:00
Michael Steenbeek
03926c46d0 Update to v1.4.4 objects release 2024-04-27 19:30:39 +02:00
Michael Steenbeek
e6207ee1b3 Merge pull request #21888 from AaronVanGeffen/scenes-refactor
Refactor logic into scenes (IntroScene/TitleScene/GameScene)
2024-04-27 14:01:06 +02:00
Aaron van Geffen
56cbc0eb8a Refactor intro into IntroScene 2024-04-26 20:35:16 +02:00
Michael Steenbeek
be9f1a2072 Merge pull request #21711 from AaronVanGeffen/peep-data
Refactor peep animation data
2024-04-26 20:06:31 +02:00
Michael Steenbeek
6d0b02e524 Merge pull request #21905 from Harry-Hopkinson/refactor-constant-notation
Refactor constant notation and replace macros with constexpr.
2024-04-26 19:29:29 +02:00
Harry-Hopkinson
74513374d1 Rename MAX_SERVER_DESCRIPTION_LENGTH to kMaxServerDescriptionLength 2024-04-26 17:56:20 +01:00
Harry-Hopkinson
7aed4d18f2 Rename NETWORK_LAN_BROADCAST_MSG to kNetworkLanBroadcastMsg 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
82c31b80d4 Rename NETWORK_LAN_BROADCAST_PORT to kNetworkLanBroadcastPort 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
5ef115941d Rename NETWORK_DEFAULT_PORT to kNetworkDefaultPort 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
ef7d7575de Rename PALETTE_TOTAL_OFFSETS to kPaletteTotalOffsets 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
8ce6ba7606 Rename WINDOW_LIMIT_RESERVED to kWindowLimitReserved 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
9e2b45fab3 Rename WINDOW_LIMIT_MAX to kWindowLimitMax 2024-04-26 17:55:23 +01:00
Harry-Hopkinson
343b10c172 Rename WINDOW_LIMIT_MIN to kWindowLimitMin 2024-04-26 17:55:23 +01:00
Michael Steenbeek
7a1b4ce425 Merge pull request #21653 from duncanspumpkin/moveTextInput
Move Text input widget to Ui library
2024-04-26 18:53:43 +02:00
duncanspumpkin
34fa06cd29 Address review comments 2024-04-26 18:27:15 +02:00