1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Commit Graph

24895 Commits

Author SHA1 Message Date
ζ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
Matthias Moninger
e6bee21682 Merge pull request #20303 from Gymnasiast/fix/20083
Fix #20083: Cannot use terrain surfaces with ID > 32
2023-05-31 17:16:07 +03:00
OpenRCT2 git bot
162cda9ca1 Merge Localisation/master into OpenRCT2/develop 2023-05-30 04:02:12 +00: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
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
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
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
ζ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
Michael Steenbeek
1f5e9ac285 Clean up path additions entry index handling (#20177)
* Clean up path additions entry index handling

* Bump network version
2023-05-20 09:33:02 +01:00
Michael Steenbeek
7caf400465 Changelog: small typography and spelling fixes (#20244) 2023-05-19 08:59:25 +00:00
Rik Smeets
5b117ce910 Merge pull request #20078 from Gymnasiast/refactor/laydown-coaster
Cleanup uninverted Laydown RC code
2023-05-19 10:26:40 +02:00
LurkerRCT
946e57b7dd Add Side Friction Roller Coaster colour preset (#20243)
* Update SideFrictionRollerCoaster.h

* Update changelog.txt

* Update src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h

Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>

* Update distribution/changelog.txt

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

---------

Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2023-05-19 08:19:03 +00:00
Michael Steenbeek
5e495d63c7 Close #15660: Allow showing window buttons on the left (#20176) 2023-05-19 10:17:38 +02:00
OpenRCT2 git bot
e1f7b240da Merge Localisation/master into OpenRCT2/develop 2023-05-19 04:01:55 +00:00
Matthias Moninger
551a68138e Merge pull request #20233 from ZehMatt/fix-tooltips
Fix tool tips disappearing too quickly
2023-05-18 20:01:45 +03:00
Matthias Moninger
7b58bf4281 Merge pull request #20232 from ZehMatt/fix-20223
Fix #20223: Reduce amount of audio samples to 256 to avoid high latency
2023-05-18 20:00:38 +03:00
ζeh Matt
bdbb9023da Fix tool tips disappearing too quickly 2023-05-18 18:08:16 +03:00
ζeh Matt
a51d8066bf Fix #20223: Reduce amount of audio samples to 256 to avoid high latency 2023-05-18 17:22:11 +03:00
Bart Ribbers
053c00218f Fix int32_t being undefined on Musl systems due to missing import (#20231) 2023-05-18 14:16:59 +01:00
OpenRCT2 git bot
e0ec4f9347 Merge Localisation/master into OpenRCT2/develop 2023-05-18 04:01:50 +00:00
Matthias Moninger
6bd5f75330 Update the UI at screen refresh rate (#20214)
* Update the UI at screen refresh rate

* Decouple input from ticks, fix scroll at high frame rates

* Fix holding down mouse button on buttons causing too many events

* Subtract the initial delay to keep the same behavior as before

* Guard against the rare case where the value might be 0

* Fix right click not working correctly

* Fix odd behavior when using right click to scroll lists

* Make touch work again, fix mouse panning in fullscreen (borderless)

* Update changelog.txt
2023-05-17 19:19:44 +00:00
kyphii
0b18bc0923 Fix #20111: All coaster types can access the new diagonal slope pieces (#20150)
* Fix access to diagonal slopes and turns

* Add changelog entry

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-05-17 19:42:09 +01:00
spacek531
4507d3e5c4 fix restraints with 8 angles (#20197) 2023-05-17 19:41:23 +01:00
Michael Steenbeek
4a79af7b20 Use strong enum for ViewportSetVisibility (#20230) 2023-05-17 19:27:22 +01:00
Michael Steenbeek
fe2d1e2372 Small symbol cleanup (#20229)
* Remove unused generate_string_file() declaration

* Move IsUserStringID() to RCT12.h

The function is only used by RCT1/2 code, and the implementation is in RCT12.cpp

* Move ScenarioTranslate() to ScenarioRepository.cpp

Seems to have ended up in ObjectRepository.cpp by accident.
2023-05-17 19:27:04 +01:00
Matthias Moninger
d72fce1721 Merge pull request #20228 from Gymnasiast/patch-1
en-GB: Fix misspelling
2023-05-17 16:31:39 +03:00
Michael Steenbeek
00b12c9dc9 en-GB: Fix misspelling
Unlike the noun (`licence` vs `license`), the verb `to license` is always spelt with an ‘s’, including in British English.
2023-05-17 14:10:17 +02:00
OpenRCT2 git bot
052dd01d7d Merge Localisation/master into OpenRCT2/develop 2023-05-17 04:02:05 +00:00
AuraSpecs
4717c51a3e Add forgotten changelog entry (#20212) 2023-05-15 22:50:16 +02:00
Hielke Morsink
b87ab1cb81 Add OpenRCT2 Main Theme 2023-05-15 21:48:25 +02:00
Hielke Morsink
27e06ef7b7 Fix naming collision 2023-05-15 21:30:06 +02:00
Hielke Morsink
fd3346b4b3 Fix: items after the removed RCT1 theme have wrong index 2023-05-15 21:13:47 +02:00
Karst
286d116026 Update OpenMusic to v1.3.1
Co-Authored-By: Hielke Morsink <hielke.morsink@gmail.com>
Co-Authored-By: deurklink <6469413+Deurklink@users.noreply.github.com>
Co-Authored-By: Ted John <intelorca@gmail.com>
2023-05-15 19:26:49 +01:00