1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Commit Graph

20429 Commits

Author SHA1 Message Date
Gymnasiast
a3a09577be Fix outdated patrol areas showing up after map shift 2024-05-18 21:10:53 +02:00
Gymnasiast
3bb1f8e18a Guard more moves with null check 2024-05-18 21:10:53 +02:00
Gymnasiast
dde7a8270a Only shift ride locations if they are not null 2024-05-18 21:10:53 +02:00
Gymnasiast
308912b8ce Fix rebase error 2024-05-18 21:10:53 +02:00
Gymnasiast
86f80faca8 Also shift jumping fountains and map animations 2024-05-18 21:10:53 +02:00
Gymnasiast
4f41734dc5 Update for changes on develop 2024-05-18 21:10:53 +02:00
Ted John
1c2bc82456 Fix ShiftMap when x or y is 0 but not both 2024-05-18 21:10:53 +02:00
Ted John
e887662d15 Fix shifting of banner positions 2024-05-18 21:10:53 +02:00
Ted John
58292caf22 Fix code formatting for Map.cpp 2024-05-18 21:10:53 +02:00
Ted John
641d8f70aa Get the entity tweener outside the loop 2024-05-18 21:10:53 +02:00
Ted John
13c4ee5213 Do not tween entities when shifting them 2024-05-18 21:10:53 +02:00
Ted John
776fa71a4f Use edge as template for new tiles 2024-05-18 21:10:52 +02:00
Ted John
abc67f09e6 Add ability to shift map 2024-05-18 21:10:52 +02:00
Aaron van Geffen
4e2f546d14 Fix sound effects not working 2024-05-18 13:12:08 +02:00
rohan4412
24a24e3f53 Part of #21421: Replace constants that use #define with ones that use constexpr (#21883)
* rename MAX_SCROLLING_TEXT_MODES to kMaxScrollingTextModes

* Rename FRAME_RENDERING_START to kFrameRenderingStart

* Rename FRAME_EFFECTS_START to kFrameEffectStart

* Rename CONTROLS_GROUP_START to kControlsGroupStart

* Rename THEMES_GROUP_START to kThemesGroupStart

* Rename TOOLBAR_GROUP_START to kToolbarGroupStart

* Rename TITLE_SEQUENCE_START to kTitleSequenceStart
2024-05-18 10:37:42 +00:00
Aaron van Geffen
69847a02ed Open NetworkStatus window quietly (#22059) 2024-05-18 10:54:08 +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
Harry Hopkinson
ef8618209e Move gMarketingCampaigns to GameState_t 2024-05-17 21:20:27 +02:00
Aaron van Geffen
2ff3295587 Report FileIndex index progress to Context
Progress is passed on to PreloaderScene and NetworkInfo window from there.
2024-05-06 14:26:00 +00:00
Aaron van Geffen
3e000d550b Prevent NetworkStatusWindow border from flashing on update 2024-05-06 15:44:07 +02:00
Aaron van Geffen
db73b1fede Move TitleSequenceManager::Scan into preloader as well
Add strings for checking and loading title sequence
2024-05-06 14:08:49 +02:00
Aaron van Geffen
809fe4a51b Initialise scenes only when they are first accessed 2024-05-06 14:08:35 +02:00
Aaron van Geffen
3cda6e367b Don't use preloader scene when in headless mode to fix replay tests
This splits off the initialisation calls to a new InitialiseRepositories function.

The SetCompletionScene invocation is moved to the Launch method. When the game is running
in headless mode, the preloader is not used. Instead, InitialiseRepositories is called in-thread,
and the transition to the 'completion scene' happens immediately after.
2024-04-25 23:55:52 +02:00
Aaron van Geffen
fe7152fc72 Skip viewport render during preloader
Reset screen to a nice background colour
2024-04-24 23:15:21 +02:00
Aaron van Geffen
9f45d40bae Add localisable progress status messages 2024-04-24 19:40:46 +02:00
Aaron van Geffen
7c4be9ce92 Introduce PreloaderScene for game initialisation
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2024-04-24 18:31:00 +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
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
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
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
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
96ce7f706f Move widget constants from Windows.h to Widget.h 2024-05-10 22:14:10 +02:00
Aaron van Geffen
738471ff84 Deduplicate button width and alignment code 2024-05-09 12:35:34 +02:00