1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Commit Graph

26202 Commits

Author SHA1 Message Date
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
ba9c84f835 Move Csg path related functions into their own header (#22004) 2024-05-10 12:05:52 +02:00
Harry Hopkinson
98ac3a1bbc Replace GfxDrawString() with DrawText() 2024-05-10 09:56:03 +00:00
Michael Steenbeek
2d99e49a05 Add literal suffix rule to clang-tidy
This is what the codebase already uses (at least in most places).
2024-05-10 11:41:34 +02:00
Duncan
eded6e2129 Readd algorithm header where it is used (#22000) 2024-05-10 10:37:01 +01:00
Duncan
2884e095c9 Don't include windows.h when not used 2024-05-10 09:27:17 +02:00
OpenRCT2 git bot
cecd4b04c8 Merge Localisation/master into OpenRCT2/develop 2024-05-10 04:01:41 +00:00
Mike
d58673105d Close #21974: No reason specified when attempting to place path additions on junctions 2024-05-09 12:45:33 +00:00
Michał Janiszewski
63e996194f Reduce inclusion of FixedVector.h (#21994)
FixedVector class requires use of algorithm include, one of C++'s
heaviest, while in practice it is used only in handful of places.

See #21947 for methodology

372-266=106 #include <algorithm>s fewer
2024-05-09 12:34:18 +00:00
Claudio Tiecher
10a5d790c6 Part of #21421: replace define with constexpr (#21760)
* Part of #21421: refactor TUNNEL_MAX_COUNT

* Part of #21421: deleted unused OBJECT_SELECTION_NOT_...

* Part of #21421: refactor MAX_SERVER_DESCRIPTION_LENGTH

* Part of #21421: refactor EXPENDITURE_TABLE_MONTH_COUNT

* Part of #21421: refactor FINANCE_GRAPH_SIZE

* Part of #21421: refactor NETWORK_STREAM_VERSION and _ID

* Part of #21421: MONEY_STRING_MAXLENGTH

* Part of #21421: deleted MAX_USER_STRINGS

* Part of #21421: refactor USER_STRING_MAX_LENGTH

* Part of #21421: deleted USER_STRING_END

* Part of #21421: refactor REAL_NAME_START

* Part of #21421: refactor REAL_NAME_END

* Part of #21421: deleted FONT(X) and FONT_OPENRCT2_SPRITE

* Part of #21421: refactor CURRENCY_SYMBOL_MAX_SIZE

* Part of #21421: refactor CURRENCY_RATE_MAX_NUM_DIGITS

* Part of #21421: refactor SCROLLABLE_ROW_HEIGHT

* Part of #21421: refactor ADD_CLAMP_BODY

* Part of #21421: applied clang-format to Util.cpp

* Part of #21421: incorporate feedback from #21760

* Part of #21421: revert to nbsp in Currency.cpp

* Part of #21421: fix merge conflict

* Part of #21421: fix more merge conflict

* Part of #21421: apply clang format

* Part of #21421: using std::numerics for finding bounds

* Part of #21421: fix reference to kAddClampBody

* Part of #21421: improved on comments about AddClamp func

* Part of #21421: apply correct network stream version number

* Part of #21421: apply clang-format
2024-05-09 08:59:03 -03:00
Michał Janiszewski
24a2db9fc9 Remove <algorithm> include from Location.hpp (#21993)
See #21947 for methodology

528-372=156 `#include <algorithm>`s fewer
2024-05-09 11:54:40 +00:00
Harry Hopkinson
613d60b446 Refactor more constants in TrackPaint.h (#21942) 2024-05-09 06:41:47 -03:00
Aaron van Geffen
47d0996b4f Merge pull request #21981 from AaronVanGeffen/map-window
Rework map window to take map size into account
2024-05-09 10:54:22 +02:00
Aaron van Geffen
81e068c7b2 Merge pull request #21990 from AaronVanGeffen/config-include
Remove Config.h include (and therefore Drawing.h) from many places
2024-05-09 00:00:42 +02:00
Aaron van Geffen
a61a561d01 Remove Currency.h include from Localisation.h 2024-05-08 23:41:42 +02:00
Aaron van Geffen
a627cf7a1e Remove Drawing.h include from Config.h 2024-05-08 23:18:53 +02:00
Aaron van Geffen
ca6f142a97 Remove Config.h include from many places 2024-05-08 22:29:32 +02:00
Michael Steenbeek
ca1118c2f1 Merge pull request #21985 from AaronVanGeffen/guest-constants
Use constants for balloon/umbrella/hat sprites in more places
2024-05-08 22:23:22 +02:00
Aaron van Geffen
376cb1f74a Add changelog entries 2024-05-08 17:52:58 +02:00
Aaron van Geffen
8dd22e90b4 Offset small maps to centre of scrollview 2024-05-08 17:40:28 +02:00
Aaron van Geffen
58aa5e0106 Limit map window dimensions based on map size 2024-05-08 16:36:48 +02:00
Aaron van Geffen
779e65d8b2 GameBottomToolbar: use constants for balloon/umbrella/hat sprites 2024-05-07 23:00:46 +02:00
Aaron van Geffen
73c592b137 Guest window: use constants for balloon/umbrella/hat sprites 2024-05-07 23:00:36 +02:00
Aaron van Geffen
aeef004710 Prevent map corners from being cut off (original bug) 2024-05-07 13:56:06 +02:00
Aaron van Geffen
0d3c9909b6 Map window: rework to use current map sizes 2024-05-07 13:50:44 +02:00
Michał Janiszewski
11510a0e0b Guard against possible nullptr dereference when prefetching BBox (#21978) 2024-05-07 06:21:27 +02:00
Michał Janiszewski
a611244b31 Fix #21976: Add algorithm include to fix gcc14 compile (#21977)
Co-authored-by: H3o66 <chris.h3o66@gmail.com>
2024-05-06 20:40:36 +00:00
Aaron van Geffen
d6ce62e74f JSON: allow/ignore comments in parser 2024-05-06 16:15:00 +02:00
Aaron van Geffen
893392d987 Scripting: allow precise and safe control of peep animations 2024-05-05 21:09:41 +00:00
Michael Steenbeek
bf74dfba7b Merge pull request #21965 from AaronVanGeffen/fix-cli-editor
Fix loading editor from command line
2024-05-05 22:42:24 +02:00
Aaron van Geffen
831c7651bb Scripting: tailor costume assignment to each staff type
In order to transition staff costumes to objects, we must further disentangle staff from regular peeps. This has many advantages, such as making custom entertainers or even handymen costumes. However, this means putting some restrictions on what costumes can be assigned to staff in the mean while.

We are aware of plug-ins allowing staff to be decorated like normal peeps, though, e.g. using @Manticore-007's Peep Editor. Splitting staff from peeps will mean breaking such functionality. We can do our very best to reverting 'invalid' staff to their normal outfits instead of them outright disappearing. However, in the mean time, we should disallow peep costumes from being assigned to staff to prevent further disappointment down the line.

Once we get to actually adding custom staff costumes, I plan to add a new plug-in API to get available costumes for a particular staff type. This would apply to entertainers, but also other staff types. This should make it easier for plug-in authors to tap into custom costumes in the future.
2024-05-05 22:41:52 +02:00
Michael Steenbeek
46b356047c Merge pull request #21889 from Gymnasiast/refactor/segments
Refactor blocked segments
2024-05-05 21:54:34 +02:00
Michał Janiszewski
c8ec8a550a Start v0.4.12 2024-05-05 21:00:39 +02:00
Michał Janiszewski
6838832778 Merge branch 'master' into develop 2024-05-05 20:59:44 +02:00
Michał Janiszewski
18d2b5ef6e Release v0.4.11
- Feature: [#11512] Coloured usernames by group on multiplayer servers.
- Feature: [#21734] Park admittance price can now be set via text input.
- Feature: [#21957] [Plugin] Expose whether the game is paused to the plugin API.
- Improved: [#21728] “Fix all rides” cheat now also works if a mechanic is already fixing the ride.
- Improved: [#21769] Expose “animation is backwards” wall property in Tile Inspector.
- Improved: [#21855] Add a separator between “Load Game” and “Save Game”, to avoid accidental overwriting.
- Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
- Change: [#21855] Cheats menu dropdown no longer requires dragging.
- Change: [#21866] Hide the FPS Counter when the top toolbar/widgets have been toggled off.
- Change: [#21950] Construction and removal buttons can now be held down for repeated placement.
- Fix: [#866] Boat Hire boats get stuck entering track (original bug).
- Fix: [#10701] No reason specified when placing door over unsuitable track.
- Fix: [#18723, #21870] Attempting to demolish a flat ride in pause mode allows you to place multiple copies.
- Fix: [#19559] Custom rides with long descriptions extend into lower widgets.
- Fix: [#21696] Fullscreen window option not correctly applied on macOS.
- Fix: [#21749] Crash when loading park bigger than current limits.
- Fix: [#21787] Map generator heightmap should respect increased height limits.
- Fix: [#21829] When creating a new scenario, the default name contains formatting codes.
- Fix: [#21937] Build errors with the ORIGINAL_RATINGS flag.
- Fix: [objects#324] Cannot build Colosseum inside a turn or helix.
- Fix: [objects#325] Sloped castle walls are vertically offset by one pixel (original bug).
v0.4.11
2024-05-05 20:01:29 +02:00
Michał Janiszewski
6721a74b26 Merge branch 'develop' 2024-05-05 19:55:35 +02:00
Michał Janiszewski
80ee864f37 Update backtrace.io token for upcoming release 2024-05-05 19:47:35 +02:00
Aaron van Geffen
fa90a84d22 Make construction and removal buttons holdable (#21950)
* Footpath: make construction button holdable

* RideConstruction: make construction button holdable

* Allow repeated removal as well

* Amend changelog
2024-05-05 11:38:49 +00:00
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