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

27624 Commits

Author SHA1 Message Date
Gymnasiast
774240d081 Make Loc6DC462 a loop 2025-01-25 13:59:37 +01:00
Aaron van Geffen
cf448753c1 Move WindowInvalidate and WidgetInvalidate families into WindowManager (#23692)
* Move WindowInvalidate and WidgetInvalidate families into WindowManager

* Use InvalidateWidget shorthand in more places

* Cut back on UiContext includes

* Cut back on Window.h includes

* Remove outdated parameter comments
2025-01-25 13:46:08 +01:00
Aaron van Geffen
da0a772e4d Offset dropdown text labels and separators (#23700)
* Centre dropdown separators optically and add margins

* Offset dropdown item text slightly to add a slight margin
2025-01-25 13:43:01 +01:00
Michael Steenbeek
a3d5b4e0c3 Change FIXED_XDP from macros to constexprs 2025-01-25 13:42:22 +01:00
Matt
67024cec2d Merge pull request #23694 from AaronVanGeffen/viewport-struct
Move Viewport struct to Viewport.h
2025-01-25 00:37:46 +02:00
Aaron van Geffen
c8da126c95 Move Viewport struct to Viewport.h 2025-01-24 22:44:21 +01:00
Matt
e3929c1ca9 Merge pull request #23687 from ZehMatt/fix-23686
Fix #23686: Shortcut window crashing and missing widgets
2025-01-23 11:37:32 +02:00
ζeh Matt
fe950f75d1 Add some assertions 2025-01-23 11:05:20 +02:00
ζeh Matt
e17799fb68 Fix #23686: Shortcut window crashing and missing widgets 2025-01-23 11:01:43 +02:00
ζeh Matt
9138fba9cf Prevent out of bounds access, prevents assert on debug builds 2025-01-23 11:00:30 +02:00
Michael Steenbeek
f70d202cf0 Create buttons for vertical drops in construction window (#23665) 2025-01-22 19:22:03 +01:00
Michael Steenbeek
b0c99fcb6c Refactor more constants to kConstant notation 2025-01-22 16:16:55 +00:00
Matt
b9486b9eb7 Merge pull request #23680 from ZehMatt/fix-widget-access
Fix widget access
2025-01-22 13:06:13 +02:00
ζeh Matt
87be9f0f6e Use correct widgets instance for Banner window 2025-01-22 11:48:06 +02:00
ζeh Matt
a288d0b912 Fix marketing campaign accessing the widget declaration not instance 2025-01-22 11:41:24 +02:00
Michał Janiszewski
a002834f39 Merge pull request #23515 from ethanaobrien/develop
Fix emscripten (webassembly) support
2025-01-21 17:14:03 +01:00
spacek531
4b3a342e81 Remove screaming snake case constant TRACK_BLOCK_2 (#23657) 2025-01-21 11:54:11 +01:00
Matt
ad5c469316 Merge pull request #23670 from ZehMatt/fix-23655
Fix #23655: Crash with invalid widget index
2025-01-21 12:51:21 +02:00
ζeh Matt
e454f27518 Fix #23655: Crash with invalid widget index 2025-01-21 12:00:24 +02:00
Ethan O'Brien
a34e5f840d Use kStringIdNone on emscripten buttons 2025-01-20 08:31:12 -06:00
Ethan O'Brien
0310084c04 Merge branch 'develop' into develop 2025-01-20 08:28:57 -06:00
spacek531
5bec62c540 Beautify TrackData.cpp 2025-01-20 15:26:31 +01:00
Ethan O'Brien
2195abd80a Add ccall to exported runtime methods 2025-01-20 08:06:06 -06:00
Michał Janiszewski
0eca0198dd Emscripten: handle missing assets 2025-01-20 11:33:19 +01:00
Michał Janiszewski
b576d896c6 Upload CI assets from correct path 2025-01-20 11:33:19 +01:00
Michał Janiszewski
4f1e92dbf8 Emscripten: build in CI 2025-01-20 11:33:19 +01:00
OpenRCT2 git bot
81168d57b8 Merge Localisation/master into OpenRCT2/develop 2025-01-20 04:02:19 +00:00
Aaron van Geffen
a8773dd805 Move WindowClose family into WindowManager (#23646)
* Replace WindowClose() calls with Close method calls where possible

* Move WindowClose family into WindowManager

* Remove UpdateSceneryGroupIndexes hack
2025-01-19 18:49:18 +01:00
Michael Steenbeek
be9f27e4f9 Mass rename constants (#23656) 2025-01-19 15:59:45 +00:00
spacek531
bf413b2ab7 Booster code cleanups/unified booster speed preparation 2025-01-19 16:43:26 +01:00
Aaron van Geffen
5fbe8d0ae1 Centralise external window signatures in Windows.h (#23653) 2025-01-19 15:50:54 +01:00
Aaron van Geffen
bed4d5bdca Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)
* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
2025-01-19 06:58:28 -03:00
OpenRCT2 git bot
66ede938f8 Merge Localisation/master into OpenRCT2/develop 2025-01-19 04:01:56 +00:00
Ethan O'Brien
0fc6daf663 Resolve merge conflicts 2025-01-18 18:11:49 -06:00
Ethan O'Brien
c21d369cd6 Check for EMSCRIPTEN variable in emscripten builds 2025-01-18 17:59:00 -06:00
Ethan O'Brien
06ec59d938 Fix pthreads check on emscripten 2025-01-18 17:54:16 -06:00
Aaron van Geffen
e1fa0b539d Move Widget, Window, Intent, MouseInput into OpenRCT2 namespace (#23642) 2025-01-18 15:29:41 +02:00
Matt
b9f6b6f754 Refactor widgets state (#23621)
* Refactor windows to not share widget state

* First half of refactoring all the windows

* Refactor the remaining windows, compiles but has issues

* Fix drawing only every second widget

* Remove the need of an terminating widget

* Address WidgetIndex signedness issues; use kWidgetIndexNull more

* Address constexpr issue with Widget content union

* Fix tabs in scenery window

* Fix tabs in object selection window

* Adjust custom widget index for CustomTool events

* Use STR_NONE for default tooltip initialisation

* Adjustment for mingw compiler

* Fix bottom toolbar using the widget declaration not instance

* Remove pointless code in Guest window, handled by SetPage

* Prevent out of bounds crash

* Move scroll widgets initialization to SetPage in Cheats window

* Remove special logic in Options window

* Remove special logic in Park window

* Remove special logic for Player window

* Remove special logic for Research window

* Remove special logic for Ride window

* Remove special logic for Staff window

* Remove special logic for Finances window

* Remove special logic for MapGen window

* Remove special logic for editor objective options window

* Remove special logic for editor scenario options window

* Fix widgets not being set since page is initialized to 0

* Remove more redundant code

* Fix remaining access to widget declarations

* Remove unused variable

* Fix editor object selection tabs on successive windows

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2025-01-18 13:45:17 +01:00
OpenRCT2 git bot
4dac6ff030 Merge Localisation/master into OpenRCT2/develop 2025-01-18 04:02:08 +00:00
Ryan Gudonis
7819a35839 Add #20683 to changelog 2025-01-17 20:01:51 +01:00
X123M3-256
29503e6606 Allow cable lift to start after block brake 2025-01-17 19:38:15 +01:00
Ethan O'Brien
f7ca73c6eb Correct Persistent spelling 2025-01-17 09:33:05 -06:00
Ethan O'Brien
b4d72427ff Resolve code formatting issues 2025-01-17 08:36:38 -06:00
Ethan O'Brien
89859a40f9 Move export/import functions to a javascript library 2025-01-17 08:32:25 -06:00
73
68789ec882 Fix erroneous statement about branching 2025-01-15 20:29:54 +01:00
X123M3-256
a935084e55 Fix holding brakes being skipped if they're too close together 2025-01-15 12:54:27 +00:00
X123M3-256
864d9b2d73 Add large diagonal flat to steep and dive loop track pieces 2025-01-15 13:25:29 +01:00
ZeeMaji
9b8ecc06c8 Restore lost diag brakes 2025-01-14 16:28:15 +01:00
Matt
4330909f90 Merge pull request #23556 from ZehMatt/ride-queue
Ride queue safety
2025-01-14 17:11:25 +02:00
Andrew
60b6907c44 Fixed tile inspector shortcut keys for raise/lower height 2025-01-14 00:09:21 +01:00