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

26263 Commits

Author SHA1 Message Date
Aaron van Geffen
69847a02ed Open NetworkStatus window quietly (#22059) 2024-05-18 10:54:08 +02:00
OpenRCT2 git bot
5260b5d52f Merge Localisation/master into OpenRCT2/develop 2024-05-18 04:01:52 +00:00
Aaron van Geffen
14828e4416 Merge pull request #22016 from AaronVanGeffen/ui-string-ids
Move UI exclusive string ids to UiStringIds.h
2024-05-18 00:04:16 +02:00
Michael Steenbeek
340a6838cc en-GB: Use actual ellipses
Small oversight from #21893.
2024-05-17 19:32:29 +00:00
Harry Hopkinson
ef8618209e Move gMarketingCampaigns to GameState_t 2024-05-17 21:20:27 +02:00
Aaron van Geffen
8b51112a81 Merge pull request #21893 from AaronVanGeffen/loading-scene
Introduce preloader scene with progress info
2024-05-17 15:02:21 +02:00
Stephan Spengler
f4156e9043 Create or delete banners when tile elements are changed by plugins (#21627) 2024-05-17 07:54:51 -03:00
OpenRCT2 git bot
919cef7f55 Merge Localisation/master into OpenRCT2/develop 2024-05-17 04:01:51 +00:00
Michael Steenbeek
5b57071d73 en-GB: Fix word order in STR_6630 2024-05-16 16:41:04 +02:00
spacek531
6ba33b735a Fix #22038: Upward helix button missing 2024-05-16 12:53:55 +02:00
Michael Steenbeek
288575c4ff Use kDefaultGeneralSupportHeight throughout 2024-05-15 21:25:02 +02:00
Aaron van Geffen
2f68c7e823 Move STR_NONE, STR_EMPTY to StringIdType.h (#22019) 2024-05-15 20:29:11 +02:00
Aaron van Geffen
3e4a77fd50 Merge pull request #22034 from AaronVanGeffen/money-header
Move fixed point and money types into FixedPoint.hpp and Money.hpp
2024-05-15 19:44:58 +02:00
Aaron van Geffen
6c66bff4b6 Let heavy snow and blizzards make guests buy and use umbrellas (#21986) 2024-05-14 19:18:42 +02:00
Aaron van Geffen
308219d32e Move speed literal _mph to Speed.hpp (#22033) 2024-05-14 17:04:49 +00:00
Aaron van Geffen
69c5e6ad9e Move money types into Money.hpp 2024-05-14 16:35:00 +02:00
Aaron van Geffen
9a4aa4bb94 Move fixed point types to FixedPoint.hpp 2024-05-14 16:25:52 +02:00
Michał Janiszewski
3c35558f3f Fix compilation on Arch Linux with GCC 14 (#22031)
Fixes #22029
2024-05-13 22:09:00 +00:00
spacek531
104a5d5222 Add legacy field for booster parameters to Ride Type Descriptor
This pull request is spun off from Unify Speed #16692 for ease of review, as well as making it easier to address some future features independent of Unify Speed.

This PR separates the OperationSettings field of RTD into 3 new fields, since the OperationSettings struct was bloated with things that are not operation settings.

This PR implements legacy and non-legacy ("modern") booster setting fields. In preparation for Unify Speed, the legacy properties are set to match the values as they stand. Separating legacy from modern allows the modern values to be changed in accordance with #21752 while preserving backwards-compatibility.

Unify Speed or a spun-off subset PR will implement a vehicle flag to switch between legacy and modern behavior, which all older parks will import with, while new rides will use the non-legacy "modern" behavior. Unify speed or a spin-off will implement enforcing brake and booster speeds.
2024-05-13 21:45:18 +00:00
Aaron van Geffen
1a5f4c6952 Offset minimap using screen coords instead 2024-05-13 23:31:06 +02:00
Michael Steenbeek
6979e88b9e Clean up more diagonal track drawing
This consists mostly of using `TrackPaintUtilDiagTilesPaint()` where appropriate, as well as cleaning up some duplicate constants in the monorail/miniature railway paint code.
2024-05-13 14:37:35 +02:00
Michał Janiszewski
7239810d39 Restore #include <algorithm> in AssetPackManager.cpp (#22028)
https://aur.archlinux.org/pkgbase/openrct2-git/
2024-05-13 13:15:07 +02:00
spacek531
6df16c7946 Clean up more ride type references 2024-05-13 09:20:51 +02:00
Aaron van Geffen
4ffe00aaba Keep options window centred after a resize (#22026) 2024-05-12 21:07:32 +00:00
Michael Steenbeek
59297f0038 Use a supports constant in track drawers (#22024) 2024-05-12 21:43:39 +02:00
Michael Steenbeek
0e245692b2 Fix #22008: Lay-down roller coaster uses the wrong supports 2024-05-12 10:37:53 +02:00
Michael Steenbeek
5407ba2d55 Close #22014: Change crossingMode to a strong enum (#22020) 2024-05-12 07:46:32 +01:00
Aaron van Geffen
57a6b0a00c Remove STR_VIEWPORT (#22018)
* Remove STR_VIEWPORT

* Remove StringIds.h include from Main.cpp
2024-05-11 18:21:45 +00:00
Harry Hopkinson
bda383c236 Fix #22007: Cannot update image of ImgButton from plugins 2024-05-11 13:32:14 +02:00
Aaron van Geffen
b3b62c86be Rename two shortcut string ids that did not follow conventions 2024-05-11 12:51:53 +02:00
Aaron van Geffen
828aeadf5b Deal with -Wdeprecated-anon-enum-enum-conversion warnings 2024-05-11 11:24:01 +02:00
Aaron van Geffen
ef4cad5ee3 Move UI exclusive string ids to UiStringIds.h 2024-05-10 23:24:46 +02:00
Aaron van Geffen
b0a3888d4d Merge pull request #21989 from AaronVanGeffen/toolbar-alignment
Optionally align the top toolbar buttons horizontally centred
2024-05-10 22:42:13 +02:00
Aaron van Geffen
96ce7f706f Move widget constants from Windows.h to Widget.h 2024-05-10 22:14:10 +02:00
Aaron van Geffen
945a799228 Merge pull request #22005 from AaronVanGeffen/config-struct
Introduce Config namespace and struct
2024-05-10 22:06:51 +02:00
Michael Steenbeek
3f92139dad Merge pull request #22015 from Gymnasiast/refactor/metal-support-stuff
Refactor metal supports
2024-05-10 21:57:49 +02:00
Gymnasiast
3ed61cac9a Name and refactor metal supports maps 2024-05-10 21:35:04 +02:00
Gymnasiast
98e980f535 Make MetalA and MetalB more like each other 2024-05-10 21:31:20 +02:00
Aaron van Geffen
9e206d5528 Remove dependency on StringIds.h from Localisation.h (#22011)
* Remove dependency on StringIds.h from Localisation.h

* Include Language.h in UTF8.cpp for function declarations

* Rename tests/Localisation.cpp to tests/LocalisationTest.cpp
2024-05-10 19:14:05 +00:00
Aaron van Geffen
86835836b5 Move strings exclusively used by ride meta data to RideStringIds.h (#22010) 2024-05-10 19:05:05 +00:00
Michael Steenbeek
6408b0537a Merge pull request #22013 from Gymnasiast/refactor/small-track-paint
Refactor slope-related things
2024-05-10 20:54:42 +02:00
Gymnasiast
42add207e9 Rename SURFACE_STYLE_FLAG_RAISE_OR_LOWER_BASE_HEIGHT 2024-05-10 20:42:12 +02:00
Gymnasiast
4cdaaa9810 Refactor slope flags 2024-05-10 20:16:07 +02:00
Gymnasiast
9e2463ff52 Name SUPPORTS_SLOPE_5, use it consistently 2024-05-10 20:16:03 +02:00
Gymnasiast
b3d9255c2d TrackData.h: drop unused import of TrackPaint.h 2024-05-10 20:15:55 +02:00
Gymnasiast
09dc7077c1 Drop 3rd parameter to PaintUtilSetGeneralSupportHeight()
It’s always 0x20
2024-05-10 20:15:51 +02:00
Harry Hopkinson
740ee91cb5 Refactor more constants in TrackPaint.h 2024-05-10 16:05:05 +02:00
Aaron van Geffen
347ce53f26 Re-introduce message on successful screenshot (#21983)
* Re-introduce message on successful screenshot

* Automatically close previous screenshot notices before new ones
2024-05-10 15:04:12 +02:00
Aaron van Geffen
92aeace98c Just undef interface macro in Config.h, if present 2024-05-10 13:07:33 +02:00
Aaron van Geffen
617003dff6 Use WIN32_LEAN_AND_MEAN in UiContext and Platform 2024-05-10 12:57:05 +02:00