mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,205 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

26205 Commits

Author SHA1 Message Date
mrmbernardi 489ae58c5c
Close #21825: Only lock OpenGL texture cache when using multi-threading (#21952) 
Fixes #21825 by making 'DrawingLocks' which lock only if multi threaded drawing is enabled. Refactors TTF.cpp to use this.

Also cleans up some header files, modernises constants, and removes code to avoid using shared_mutex on MacOS builds. This was originally added because older versions of MacOS didn't support this in the STL.
 2024-05-05 10:54:50 +00:00
OpenRCT2 git bot f3bb57a54c Merge Localisation/master into OpenRCT2/develop 2024-05-05 04:01:52 +00:00
Harry Hopkinson bbc5a109ef
Close #20157: Hide FPS Counter if top toolbar is hidden 2024-05-05 00:16:23 +02:00
Aaron van Geffen c92d3bf018 Fix loading editor from command line 2024-05-03 19:31:06 +02:00
Aaron van Geffen 770277ab95 Refactor Context::DetermineStartUpScene into its own method 2024-05-03 19:30:58 +02:00
Katherine Norton cd528665e6
Expose whether the game is paused to the plugin API 2024-05-03 15:59:57 +00:00
Mathias Gibbens accbd799ee
Fix GGC 12 compile error 
Signed-off-by: Mathias Gibbens <gibmat@debian.org>
 2024-05-03 16:05:57 +02:00
OpenRCT2 git bot cf3d4c7e22 Merge Localisation/master into OpenRCT2/develop 2024-05-03 04:02:00 +00:00
Gymnasiast 5319c0e8bd
Use TrackPaintUtilDiagTilesPaint() for broken drawers 2024-05-02 20:56:52 +02:00
Gymnasiast 3641e78341
Remove parameter from TrackPaintUtilDiagTilesPaint() 2024-05-02 20:42:12 +02:00
Michał Janiszewski a088f7615b
Fix #21748: TileElement out of bounds (#21749) 
* Fix #21748: TileElement out of bounds

This fixes crashes observed and allows the park to load. The park is
overlarge and breaks some assumptions we have in our code.

* Use ternaries for checking conditions
 2024-05-02 18:14:22 +02:00
Gymnasiast 332ba3244e
Consolidate segment+support calls for diagonal straight flat pieces 2024-05-02 18:12:53 +02:00
Gymnasiast dfd958b855
Fix Metal{A,B}SupportsPaintSetupRotated() to rotate type 2024-05-02 18:12:52 +02:00
Gymnasiast 369996809c
Add PaintSegment header, add constant for straight flat track 2024-05-02 18:12:51 +02:00
Michał Janiszewski 4e8f578075
Update Steam path detection for Linux (#21948) 
* Update Steam path detection for Linux

As Steam now uses Proton to install Windows version natively, update
paths so they get found automatically

* Use new Steam path detection on Linux only

This restores Steam path detection on macOS as it doesn't have Proton
 2024-05-02 15:05:22 +02:00
OpenRCT2 git bot 9f69b532b1 Merge Localisation/master into OpenRCT2/develop 2024-05-02 04:01:58 +00:00
Aaron van Geffen 17920b6039
Script: when changing staff type, reset state to walking 
Reset state to walking to prevent invalid actions from carrying over
 2024-05-01 23:10:25 +02:00
Ryan Gudonis 339a572d03
List Fix #866 as original bug (#21953) 2024-05-01 19:47:11 +02:00
Michał Janiszewski 7b12667ddb
Reduce `<algorithm>` include (#21947) 2024-05-01 13:47:27 +02:00
Aaron van Geffen 8973e35ba1
Stabilize scenario and track editors\ 2024-05-01 12:34:10 +02:00
Michał Janiszewski ad79699b21
Reduce transient inclusion of `<future>` (#21944) 2024-05-01 12:27:51 +02:00
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