Commit Graph

26488 Commits

Author SHA1 Message Date
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
cde9a7706f Add changelog entry 2023-05-26 19:39:48 +02: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
Hielke Morsink
66ae20b47b Merge pull request #20286 2023-05-25 12:09:17 +02:00
OpenRCT2 git bot
f041680400 Merge Localisation/master into OpenRCT2/develop 2023-05-25 04:01:58 +00: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
ccdb97a3bf Remove object override from en-gb 2023-05-23 21:45:54 +01:00
duncanspumpkin
3f2126662f Properly remove the object override code 2023-05-23 21:43:52 +01:00
Matthias Moninger
2ca1af9e0c Merge pull request #20270 from ZehMatt/fix-20250
Fix #20250: Entity tweening corrupting entity positions changing parks
2023-05-23 17:33:25 +03:00
OpenRCT2 git bot
a1c5954b80 Merge Localisation/master into OpenRCT2/develop 2023-05-23 04:02:05 +00: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
OpenRCT2 git bot
4f6ad87e25 Merge Localisation/master into OpenRCT2/develop 2023-05-21 04:01:58 +00:00