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

19490 Commits

Author SHA1 Message Date
ζeh Matt 99aea9dba8
Remove dead code 2023-06-30 17:13:35 +03:00
ζeh Matt 69d5e0b280
Use u8string for TTF cache 2023-06-30 17:11:13 +03:00
ζeh Matt d37478e294
Remove google benchmark dependency 2023-06-30 16:37:11 +03:00
ζeh Matt d61ce4e38c
Remove BenchGfx 2023-06-30 16:37:11 +03:00
ζeh Matt edabd97c8a
Remove benchmark code from game logic 2023-06-30 16:35:05 +03:00
ζeh Matt bcb0c069c3
Remove dead code of TestPaint and remove BenchSpriteSort 2023-06-30 16:34:55 +03:00
Aram Kazorian 3f603542ec
Refactoring by deleting dead WindowEventList struct (#20513) 2023-06-30 06:05:23 +01:00
mrmbernardi 68d4304bbc
Fix #19878: Pre-built rides respect scenery research (#20472) 2023-06-29 21:50:06 +01:00
mrmbernardi b02fad3404
Fix #20365: Money cheat supports negative value entry (#20478) 2023-06-29 21:47:51 +01:00
duncanspumpkin a68865d016 Remove all references to title editor 
The title editor is now a plugin and these codepaths could only be reached during bugs :)
 2023-06-29 08:14:29 +01:00
duncanspumpkin aa93b8d041 Fix crash when selection scenarios 2023-06-29 08:07:35 +01:00
ζeh Matt 88ec42e7ab
Remove WindowUpdateAll from GameLoadInit 2023-06-28 23:53:09 +03:00
Matthias Moninger a7bbe77148
Merge pull request #20502 from ZehMatt/platform-cleanup 
Cleanup Platform code
 2023-06-28 16:25:17 +03:00
Matthias Moninger 39771217c8
Merge pull request #20493 from ZehMatt/delayed-window-delete 
Refactor window deletion to be delayed
 2023-06-28 01:40:12 +03:00
Duncan 0747ad7497
Remove even more window uncommon vars (#20495) 
* Break uncommon union

* Move uncommon highlightedScenario into derived

* Split off multi use variable

* Adjust name
 2023-06-27 22:33:26 +01:00
ζeh Matt ac583569da
Remove Platform::CoreInit 2023-06-27 23:35:11 +03:00
ζeh Matt 484523f82f
Use static initialization for Android class loader 2023-06-27 23:09:53 +03:00
Matthias Moninger b347cbce03
Merge pull request #20473 from IntelOrca/fix-14853 
Fix #14853: [Plug-in] Subscribing to a non-existing event crashes game
 2023-06-27 23:07:24 +03:00
ζeh Matt 60a2d5c1f6
Use static initialization to get the correct masking function 2023-06-27 23:02:31 +03:00
ζeh Matt 873fff2513
Remove BitCountInit and handle that with static initialization 2023-06-27 22:45:19 +03:00
ζeh Matt a83337b2da
Use chrono for GetTicks and move into Platform.Common.cpp 2023-06-27 22:21:42 +03:00
ζeh Matt e19738b5d3
Remove Sleep functions and use Common version 2023-06-27 22:11:52 +03:00
ζeh Matt d8009291c4
Rename Shared.cpp to Platform.Common.cpp 2023-06-27 22:10:16 +03:00
ζeh Matt 905f1ea094
Shorten the lambda 2023-06-27 17:55:03 +03:00
ζeh Matt 6807d508d0
Ignore dead windows for auto positioning 2023-06-27 17:37:49 +03:00
mrmbernardi cf7c486c5f
Fix #20364: Adding too much money with cheats causes an overflow 2023-06-27 13:29:48 +00:00
ζeh Matt 5497601d42
Refactor window deletion to be delayed 2023-06-27 15:41:25 +03:00
Duncan d40102aa9d
Remove some uncommon variables and break unions (#20440) 2023-06-27 06:34:06 +01:00
Ted John 30664df8e9 Fix #14853: [Plug-in] Subscribing to a non-existing event crashes game 2023-06-27 00:08:05 +01:00
Matthias Moninger 3b7975f4a0
Remove redundant warning suppression code 2023-06-26 20:01:03 +02:00
Duncan 0c5a35993e
Remove union from window internal (#20429) 
* Remove campaign vars from union

* Remove error union

* Remove new_ride union

* Remove Unknown5

* Update changelog
 2023-06-26 16:31:04 +01:00
Matthias Moninger 269370fdd2
Merge pull request #20454 from duncanspumpkin/rideRefactor 
Apply coding style to ride window
 2023-06-26 16:36:18 +03:00
Matthias Moninger 49c5ceda66
Merge pull request #20462 from ZehMatt/script-crash 
Fix crashes when custom plugin actions fail due to immutable state
 2023-06-26 16:12:41 +03:00
Matthias Moninger b291c87d51
Merge pull request #20271 from duncanspumpkin/objDescriptor 
Rework Object Identifier callers
 2023-06-26 16:11:45 +03:00
ζeh Matt cdb16bf8bb
Fix crashes when custom plugin actions fail due to immutable state 2023-06-26 15:56:20 +03:00
Matthias Moninger 9e57fcc6d4
Merge pull request #20474 from ZehMatt/fix-cheatsetaction-query 
Actually return the game action result in CheatSetAction::Query
 2023-06-26 15:47:52 +03:00
duncanspumpkin 697712c352 Apply formating 2023-06-26 08:26:25 +01:00
duncanspumpkin ed5abfc7de Apply coding style to ride window 2023-06-26 08:26:25 +01:00
Matthias Moninger fb1b531d59
Fix build error due to stale base branch for #20100 (#20476) 2023-06-26 08:10:01 +01:00
Matthias Moninger 3edb044685
Merge pull request #20100 from IntelOrca/plugin/object-manager 
Add plugin APIs for the object manager
 2023-06-26 02:26:13 +03:00
ζeh Matt 93536c802e
Actually return the game action result in CheatSetAction::Query 2023-06-26 02:09:12 +03:00
Aaron van Geffen 627fcec7e9 Revert change in BitSet 2023-06-24 13:25:33 +02:00
Aaron van Geffen 2697ed1920 Formatting 2023-06-24 11:48:14 +02:00
Aaron van Geffen d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
Aaron van Geffen f9d8c5923d
Replace surface corner hex values with named constants 2023-06-24 01:48:25 +02:00
Duncan 4a3a1e4e7f
Remove event handlers (#20439) 2023-06-23 08:31:31 +01:00
Duncan 622c8cdb7e
Fix #20433. Dropdown default selections not working (#20437) 
This fixes it for rides but it is also an issue effecting a few different dropdowns
 2023-06-23 06:20:02 +01:00
Duncan a6d3dbc6d9
Remove player specific window vars from common 2023-06-23 00:44:17 +02:00
Matthias Moninger 42ff471617
Fix periodic window update function being called every frame 2023-06-22 15:52:14 +02:00
Duncan 95463c015c
Actually refactor last window (#20436) 
This one was hiding
 2023-06-21 21:15:13 +01:00
Tiago A. Reul 97427743a4
Clean up SpritBoundBox2 2023-06-21 01:24:04 +02:00
Matthias Moninger ce1695fab8
Merge pull request #20404 from duncanspumpkin/rideWindow 
Ride Window refactor
 2023-06-21 01:34:40 +03:00
Severin Paul Höfer 4b39298803 Bump network version 2023-06-20 23:17:56 +02:00
zzril d6ffdb0aa1 Add Pitch values for steep diagonal drops to checks in UpdateScreamSound 
The checks in UpdateScreamSound (rct2: 0x006D796B) forgot about (steep)
diagonal drops. This resulted in riders' screams getting cut-off on
(long) steep diagonal drops once the last car reached the maximum drop
angle, and the screams re-starting as soon as the first car reached the
valley.
 2023-06-20 23:17:56 +02:00
duncanspumpkin f0658202ef Fix mistake 2023-06-20 08:52:00 +01:00
duncanspumpkin 9b8b672507 Finish linking up parts 2023-06-20 08:42:25 +01:00
Matthias Moninger 1d74d44824
Merge pull request #20418 from Gymnasiast/fix/20417 
Fix #20417: Plugin windows missing the left title bar border
 2023-06-19 22:41:35 +03:00
Michael Steenbeek 20fe5a29d3
Add missing Ukrainian letters (Єє and Ґґ) 2023-06-18 23:44:44 +02:00
Gymnasiast 11de002a55
Fix #20417: Plugin windows missing the left title bar border 2023-06-18 22:45:35 +02:00
ζeh Matt 4bffa72c45
Fix #20413: Crash attempting to navigate an empty console history 2023-06-18 15:39:26 +03:00
ζeh Matt ffa65cea0e
Exclude the 'All' tab when searching for scenery group 2023-06-17 16:40:57 +03:00
duncanspumpkin 5e71fd4796 Hook up events 2023-06-16 09:00:52 +01:00
duncanspumpkin 825634360b Finish initial sweep 2023-06-16 08:13:20 +01:00
duncanspumpkin 75799d3be5 Start refactor of ride window 2023-06-15 21:24:56 +01:00
Severin Paul Höfer ed875a1273
Fix #19860: `TRACK_ELEM_FLAG_DOWN` flag missing on downward wide curves (#20386) 
* Fix TRACK_ELEM_FLAG_DOWN flag on wide curves

* De-anonymize contributors entry

* Bump network version
 2023-06-15 20:27:18 +01:00
Matthias Moninger d9a565dd21
Fix #20361: Crash when using random map generation (#20400) 
* Fix #20361: Crash using map generation

* Update changelog.txt
 2023-06-15 20:27:00 +01:00
Michael Steenbeek 1b612b5a99
Add code to draw Cyrillic characters Ѕѕ, Іі, Її, and Јј (#20393) 2023-06-15 20:30:02 +02:00
Josh Trzebiatowski 08e352405b
Fix #19832: Scenery Search 2023-06-14 13:04:21 +02:00
Matthias Moninger f92212edaf
Fix input cursor blinking too fast (#20366) 2023-06-09 08:24:32 +01:00
ζeh Matt 65fa73a4fb
Fix peep pickup being frame rate dependent 2023-06-08 01:45:45 +03:00
Michael Bernardi 9c5c1eb858 Fix #20349: Tile inspector creates map animations 2023-06-06 21:55:15 +02:00
Luke Hobbs 4fcf4ac7e5 Fix formatting 2023-06-03 09:38:40 -04:00
Luke Hobbs a17ac8a92b Use ErrorTitle + ErrorMessage instead of newline 2023-06-03 09:36:05 -04:00
Luke Hobbs 27eec48c16 Fix formatting 2023-06-02 22:55:45 -04:00
Luke Hobbs c1f75a0906 Add plugin name to CustomAction and ScriptEngine 2023-06-02 22:04:05 -04:00
Matthias Moninger 90b65cd890
Merge pull request #20267 from ZehMatt/improve-ridelist 
Improve performance of ride list window
 2023-06-02 22:53:21 +03:00
ζeh Matt c4c3743a6b
Fix formatting 2023-06-01 01:25:07 +03:00
ζeh Matt cba6238ede
Queue game actions when issued from UI 2023-06-01 01:20:31 +03:00
ζeh Matt 0f00ad2dd2
Signal that we are inside the update phase in the right function 2023-06-01 01:17:02 +03:00
ζeh Matt 68485e20d0
Revert #20286 2023-05-31 18:21:33 +03:00
Gymnasiast 2779e82ced
Return a full error message when the object cannot be found 2023-05-27 14:47:54 +02:00
Gymnasiast 0519dec33a
Fix #20083: Cannot use terrain surfaces with ID > 32 2023-05-27 14:47:49 +02:00
Matthias Moninger 29bd730329
Merge pull request #20265 from Broxzier/bugfix/20262-random-rct1-theme-silence 
Fix #20262: random title theme can pick RCT1 when unavailable
 2023-05-26 20:56:05 +03:00
Matthias Moninger d189008747
Merge pull request #20291 from ZehMatt/guest-refactor 
Small Guest refactor
 2023-05-26 20:40:12 +03:00
Hielke Morsink 58a8e8836a
Fix #20262: random title theme can pick RCT1 when unavailable 2023-05-26 19:38:59 +02:00
Tiago A. Reul 93c1a9724e
Remove flag RIDE_TYPE_FLAG_HAS_NO_TRACK (#20239) (#20249) 
* Remove flag RIDE_TYPE_FLAG_HAS_NO_TRACK (#20239)

* Fix a couple of logical conditions in entity/Staff.cpp

* Bump NETWORK_STREAM_VERSION and add myself to contributors.md
 2023-05-26 14:08:28 +03:00
ζeh Matt 1442e19166
Improve performance of ride list window 2023-05-25 20:43:30 +03:00
ζeh Matt 12bc9777d3
Cleanup calls to GetShopItemDescriptor in Guest::DecideAndBuyItem 2023-05-25 17:50:09 +03:00
ζeh Matt 454c5aa819
Use unsigned type for ScenarioRand 2023-05-25 17:46:27 +03:00
ζeh Matt b3606566c4
Fix #20285: Workaround to disable tweening when updated from UI 2023-05-24 01:02:11 +03:00
ζeh Matt 65b582afb0
Add a way to invalidate entity tweening 2023-05-24 00:43:23 +03:00
duncanspumpkin 3f2126662f Properly remove the object override code 2023-05-23 21:43:52 +01:00
duncanspumpkin 86c02b839f Format and fix tests 2023-05-22 20:07:06 +01:00
duncanspumpkin dbb04f6a94 Further removal 2023-05-22 08:52:43 +01:00
duncanspumpkin b58a17c731 Remove localisation object overrides 2023-05-22 08:50:19 +01:00
duncanspumpkin 8f53c6dbd3 Remove bad identifier users 
Note this doesn't actually do anything under the hood it will do the same thing for now
 2023-05-22 08:46:15 +01:00
ζeh Matt 94525e1742
Fix #20250: Entity tweening corrupting entity positions changing parks 2023-05-22 04:31:48 +03:00
Matthias Moninger b9382ae9fc
Disallow firing staff who are currently fixing or inspecting rides (#20260) 
* Disallow firing staff who are currently fixing or inspecting rides

* Disable fire button when staff member is inspecting/fixing a ride

* Add changelog entry

* Up network version

* Improve error message

---------

Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
 2023-05-21 18:36:08 +02:00
AuraSpecs 870c78001e
Add new roller coaster ride colour presets (#20119) 
* Fix G2 order and format

PR #19446 did not follow the correct G2 order so this is fixing that.

Also adds the added icons to the [Plugin] chart as should when adding icons to G2.

* Add colour documentation

* Joker's Jinx colour

For the LIM Launched, based on Premier rides LIM RC.

* Poltergeist colour

Based on a Premier rides LIM RC

* Flight of Fear colour

* Add Mega-Lite colour scheme

* Add colours for Vertical Drop RC

* Add two HyperCoaster presets

Suggested by Kyphii

* Add Mako colour scheme

Suggestion by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add two colours to BM Invert

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Bobsleigh Preset

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Woodie Presets

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Looping RC preset

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Flying RC preset

Not based on one specifically, it just looks very nice.

* Update GCI Woodie preset

* Update Inverted RC's presets

Removed the skinworm and added a banshee colour scheme that you could find in the renders. Supports were a tad difficult but I think Violet pops the best with the rails so I decided to go for that.

* Change default Woodie LB Bl Bl to LB Bl DB

* Update ride presets for Twister RC

Removed Aquamarine and Moss Green because you can find Moss Green on the Flying already and Aquamarine is very close to the white.

The white I would probably change to Black & White and move it to the Wing RC once that ride type becomes available.

* Add colour presets for the 4th Dimension RC

* Add Hybrid RC presets

* Add two yellow themes for Impulse

May both rides rest in pieces

* Add colour documentation

* Joker's Jinx colour

For the LIM Launched, based on Premier rides LIM RC.

* Poltergeist colour

Based on a Premier rides LIM RC

* Flight of Fear colour

* Add Mega-Lite colour scheme

* Add colours for Vertical Drop RC

* Add two HyperCoaster presets

Suggested by Kyphii

* Add Mako colour scheme

Suggestion by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add two colours to BM Invert

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Bobsleigh Preset

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Woodie Presets

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Looping RC preset

Suggested by Kyphii

Co-Authored-By: kyphii <8711258+kyphii@users.noreply.github.com>

* Add Flying RC preset

Not based on one specifically, it just looks very nice.

* Update GCI Woodie preset

* Update Inverted RC's presets

Removed the skinworm and added a banshee colour scheme that you could find in the renders. Supports were a tad difficult but I think Violet pops the best with the rails so I decided to go for that.

* Change default Woodie LB Bl Bl to LB Bl DB

* Update ride presets for Twister RC

Removed Aquamarine and Moss Green because you can find Moss Green on the Flying already and Aquamarine is very close to the white.

The white I would probably change to Black & White and move it to the Wing RC once that ride type becomes available.

* Add colour presets for the 4th Dimension RC

* Add Hybrid RC presets

* Add two yellow themes for Impulse

May both rides rest in pieces

* Add changelog entry

* Add Water Coaster colour preset

---------

Co-authored-by: kyphii <8711258+kyphii@users.noreply.github.com>
Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
 2023-05-21 18:02:28 +02:00
Matthias Moninger a1d30b6db0
Revert audio changes (#20259) 
* Revert audio changes

* Revert changelog.txt
 2023-05-21 16:47:20 +02:00