Commit graph

2188 commits

Author SHA1 Message Date
Matthias Moninger
b291c87d51
Merge pull request #20271 from duncanspumpkin/objDescriptor
Rework Object Identifier callers
2023-06-26 16:11:45 +03:00
OpenRCT2 git bot
162cda9ca1 Merge Localisation/master into OpenRCT2/develop 2023-05-30 04:02:12 +00:00
OpenRCT2 git bot
f041680400 Merge Localisation/master into OpenRCT2/develop 2023-05-25 04:01:58 +00:00
duncanspumpkin
ccdb97a3bf Remove object override from en-gb 2023-05-23 21:45:54 +01:00
OpenRCT2 git bot
a1c5954b80 Merge Localisation/master into OpenRCT2/develop 2023-05-23 04:02:05 +00: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
OpenRCT2 git bot
4f6ad87e25 Merge Localisation/master into OpenRCT2/develop 2023-05-21 04:01:58 +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
OpenRCT2 git bot
e0ec4f9347 Merge Localisation/master into OpenRCT2/develop 2023-05-18 04:01:50 +00: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
Karst
6d84a0681e Add about info 2023-05-15 19:25:00 +01:00
Karst
674443d075 Add OpenRCT2 official title music
Co-Authored-By: Ted John <intelorca@gmail.com>
2023-05-15 19:24:10 +01:00
OpenRCT2 git bot
c964ced43f Merge Localisation/master into OpenRCT2/develop 2023-05-04 04:01:43 +00:00
OpenRCT2 git bot
87b0ccdf5e Merge Localisation/master into OpenRCT2/develop 2023-05-01 04:01:53 +00:00
OpenRCT2 git bot
d464e71b1a Merge Localisation/master into OpenRCT2/develop 2023-04-28 04:01:57 +00:00
OpenRCT2 git bot
a38fc1109c Merge Localisation/master into OpenRCT2/develop 2023-04-27 04:02:07 +00:00
OpenRCT2 git bot
443477a1dc Merge Localisation/master into OpenRCT2/develop 2023-04-22 04:01:56 +00:00
kyphii
6dfc6225e2
"Reversed Trains" Option (#19305)
* Initial commit for backwards-facing trains

* Allow persistence for reversed cars across save/load

* Make log flume turntable compatible with new reversal implementation

* Style fixes + Better implementation of inverted bank angles

* Further Style Fixes

* Code cleanup from PR feedback

* Fix GetBankRotationForDrawing function declaration

* Use update flag for reversed state

* Replace modulo operation with bit mask

* Correct guest pathing destination when entering reversed cars

* More style fixes

* Add plugin support for reversed vehicles

* Fix formatting error

* Derive reversal from ride mode for car spawning

* Formatting

* Rename function to GetPaintBankRotation

* Add reversed trains modes to Multi Dimension Coaster

* Change name of isReversed plugin API parameter for consistency

* Replace reversal operating modes with separate ride setting

* Add ALLOW_REVERSED_TRAINS flag to more ride types

* Make clang-format happy

* More Formatting

* Fix ALLOW_REVERSED_TRAINS flag on a couple rides

* Exclude flat rides from Reverse Trains tickbox when cheats are enabled

* Formatting

* Use Disable Vehicle Limits cheat for checkbox appearance condition

* Use correct swinging sprites when cars are reversed

* Update changelog and Plugin/Network/Park version numbers

* Formatting

* Add separate error String ID for clarity

* Add name to contributors.md

* Fix ride vehicle preview window with reversed trains for RCT1 train types

* Bump version numbers again

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-21 19:22:33 +03:00
OpenRCT2 git bot
f7bd96fbbf Merge Localisation/master into OpenRCT2/develop 2023-04-20 04:02:08 +00:00
OpenRCT2 git bot
c0660f00ba Merge Localisation/master into OpenRCT2/develop 2023-04-18 04:01:58 +00:00
Rik Smeets
55adb71cd8
Add keyboard shortcut to Keyboard Shortcuts window 2023-04-17 11:15:32 +02:00
OpenRCT2 git bot
e832159f35 Merge Localisation/master into OpenRCT2/develop 2023-04-17 04:02:05 +00:00
Rik Smeets
a31ff7e02e
Add prompt before resetting shortcut keys (#19905) 2023-04-16 09:22:05 +00:00
OpenRCT2 git bot
09bdd50280 Merge Localisation/master into OpenRCT2/develop 2023-04-16 04:02:01 +00:00
OpenRCT2 git bot
60ac375e31 Merge Localisation/master into OpenRCT2/develop 2023-04-14 04:01:43 +00:00
OpenRCT2 git bot
bb53ba10f6 Merge Localisation/master into OpenRCT2/develop 2023-04-13 04:01:56 +00:00
Hielke Morsink
5c34d1d7b9
Merge pull request #18713 2023-04-13 00:03:00 +02:00
OpenRCT2 git bot
126d6b091a Merge Localisation/master into OpenRCT2/develop 2023-04-12 04:01:59 +00:00
Spacek531
c57f0bd962 add strings 2023-04-11 18:05:51 -07:00
Raed
1bb1767577
Fix #19733: Favorite ride of X guests integer overflow (#19887)
* Fix #19733: Favorite ride of X guests integer overflow

Changed the variable for the number of guests favoring a ride to
match the maximum number of guests able to be in a park.

* Bump network stream and park file versions

* Added changelog entry for #19733 fix

* Reorder changelog entry
2023-04-10 20:03:25 +01:00
OpenRCT2 git bot
211bc3b156 Merge Localisation/master into OpenRCT2/develop 2023-04-10 04:01:52 +00:00
OpenRCT2 git bot
70e97bd322 Merge Localisation/master into OpenRCT2/develop 2023-04-07 04:01:48 +00:00
kyphii
39790779bb
Extend color selection dropdown with more colors (#19446)
* Setup for extended palette

* Define order for color picker cells

* Init G2 Palettes in ColoursInitMaps

* Add Glass Palettes

* Use special sprite for Invisible color

* Set up new cheat for special colors

* Add glass palettes to palette_to_g1_offset

* Add entries for new colors in TranslucentWindowPalettes

* Finish implementation of special colors cheat

* Some cleanup

* New colors almost work

* Correct g2 palette loading indices

* Invisible color sprite displays properly

* Repaint works with large scenery and walls

* Prevent random shop items from overflowing to junk palettes

* More cleanup

* Fix glass palettes

* Add mapping of new colors to original colors for UI themes

* Fix junk palettes for random shop items

* Fix missing highlight color in software renderer

* Convert small scenery support flag to allow use of new colors

* Progress on displaying new colors in software renderer

* Fix invisible color scheme sprite

* Formatting cleanup

* Resolve comparison of integer expressions of different signedness

* Index g2 palette maps to fix visible chain lift

* Progress on fixing new colors in software renderer

* Fix station and support colors

* Fix dropdown selected index

* Get invisible color (mostly) working in software renderer

* Use forceBmp for palette resources

* Remove test function definition left in by mistake

* Remove some obsolete range checks for original color values

* Add changelog entry

* Reorder color dropdown based on NE user feedback

* Some cleanup

* Further cleanup

* Formatting

* Add include for GetPaletteMapIndexForColour

* Fix a couple things I broke

* Fix function placement

* Revert "Add include for GetPaletteMapIndexForColour"

This reverts commit 0af9611e6656d792adb7a36efe7dbf3387a4a759.

* Use color constants for color order list

* Make remappable colors contiguous

* turn off clang format for ordered color list

* Appease clang

* Use all colors for random shop item animation

* Improvements to palette map resources

* Fix chain lifts again + adjustments to a few colors

* Update changelog and contributors.md

* Revert changes to S4 and S6 importers which are no longer needed

* Bump network, plugin, and minimum park versions

* Revert "Progress on displaying new colors in software renderer"

This reverts commit 337602e4a7.

* Remove unnecessary comment

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-06 08:36:07 +01:00
OpenRCT2 git bot
a794c982ba Merge Localisation/master into OpenRCT2/develop 2023-04-04 04:02:03 +00:00
Matthias Moninger
d7923c479e
Merge pull request #19481 from Gymnasiast/feature/compat-object
Add flag to mark an object as a compatibility object
2023-04-03 11:17:13 +03:00
OpenRCT2 git bot
3dcd7b6a5c Merge Localisation/master into OpenRCT2/develop 2023-03-31 04:02:00 +00:00
OpenRCT2 git bot
47e8835bc5 Merge Localisation/master into OpenRCT2/develop 2023-03-30 04:01:53 +00:00
Gymnasiast
af167552fb
Add flag to mark an object as a compatibility object 2023-03-25 14:40:03 +01:00
Duncan
e904ef406f
Fix #19503. Hide 3+ queue junction railings behind a flag (#19644)
* Fix #19503. Hide 3+ queue junction railings behind a flag

This is to prevent existing parks from changing their behaviour

* Clang format

* Bump version numbers. Update changelog

* Update text
2023-03-23 08:16:32 +00:00
OpenRCT2 git bot
198aa59480 Merge Localisation/master into OpenRCT2/develop 2023-03-17 04:02:11 +00:00
OpenRCT2 git bot
f13bdd9b18 Merge Localisation/master into OpenRCT2/develop 2023-03-04 04:01:50 +00:00
ζeh Matt
712cb49a8d
Fix #19545: Unable to scroll staff list with over 32768 staff 2023-03-03 20:19:39 +02:00
Michael Steenbeek
4a78fd772c
Fix #19524: Incorrect staff count beyond 32767 (#19530) 2023-03-01 20:58:15 +00:00
OpenRCT2 git bot
c38e9b59b0 Merge Localisation/master into OpenRCT2/develop 2023-03-01 04:01:56 +00:00
OpenRCT2 git bot
85bc32af75 Merge Localisation/master into OpenRCT2/develop 2023-02-27 04:02:17 +00:00
Michael Steenbeek
bbbb4f9336
Remove unused STR_5441 (#19487) 2023-02-26 08:08:42 -03:00
OpenRCT2 git bot
e002a8b79c Merge Localisation/master into OpenRCT2/develop 2023-02-26 04:02:10 +00:00
Josh Trzebiatowski
04aeed8692
Add "All Scenery" tab to scenery window 2023-02-22 23:31:21 +00:00