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

2301 Commits

Author SHA1 Message Date
OpenRCT2 git bot 988162e125 Merge Localisation/master into OpenRCT2/develop 2024-03-11 04:02:00 +00:00
Michael Steenbeek 1981ca6b0b
Close #16582: Translate in-game console help text 2024-03-10 19:46:21 +01:00
OpenRCT2 git bot d0592e0887 Merge Localisation/master into OpenRCT2/develop 2024-03-08 04:01:38 +00:00
OpenRCT2 git bot aa6a1b0bdd Merge Localisation/master into OpenRCT2/develop 2024-03-06 04:02:01 +00:00
OpenRCT2 git bot 33a5ee2160 Merge Localisation/master into OpenRCT2/develop 2024-03-05 04:02:03 +00:00
OpenRCT2 git bot eaa082bf3e Merge Localisation/master into OpenRCT2/develop 2024-03-03 04:01:58 +00:00
OpenRCT2 git bot 37104ed4f8 Merge Localisation/master into OpenRCT2/develop 2024-03-01 04:01:50 +00:00
Michael Steenbeek 25ec1e4211
Create game actions and UI for restricted scenery 2024-02-28 20:38:43 +01:00
OpenRCT2 git bot eceea5a034 Merge Localisation/master into OpenRCT2/develop 2024-02-23 04:01:41 +00:00
OpenRCT2 git bot 6b134a05c3 Merge Localisation/master into OpenRCT2/develop 2024-02-21 04:01:40 +00:00
OpenRCT2 git bot 5fef6d364d Merge Localisation/master into OpenRCT2/develop 2024-02-20 04:01:37 +00:00
Peter Froud 40a7fa70fc
Fix empty error messages (#21351) 
* Add `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE`

* Add `STR_ERR_TRACK_ON_THIS_TILE_NEEDS_WATER`

* Return existing `GameAction::Result`

* Add `STR_ERR_ACTION_INVALID_FOR_THAT_STAFF_TYPE`

I am open to suggestions for a different message!
Originally this was going to be STR_ERR_WRONG_STAFF_TYPE
but I thought that was confusing because the game
action arguments do not specify a staff type. We
want it to mean "the staff ID you specified is the
wrong StaffType for this game action".

* Refactor `StaffSetColour()` to return `Result`

* Remove unnecessary arguments when `Status` is `Ok`

* Refactor `SwapTileElements()` to return `Result`

Also add STR_ERR_CANT_SWAP_TILE_ELEMENT_WITH_ITSELF

* Format code

* Use `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE` in title

* Format code using Github web editor

* Format indentation
 2024-02-19 20:58:04 -03:00
OpenRCT2 git bot a0933c7020 Merge Localisation/master into OpenRCT2/develop 2024-02-19 04:01:38 +00:00
OpenRCT2 git bot 7f59e20926 Merge Localisation/master into OpenRCT2/develop 2024-02-18 04:01:35 +00:00
OpenRCT2 git bot 04603f5213 Merge Localisation/master into OpenRCT2/develop 2024-02-16 04:01:41 +00:00
OpenRCT2 git bot cb2bca7c7a Merge Localisation/master into OpenRCT2/develop 2024-02-15 04:01:47 +00:00
OpenRCT2 git bot 2d0a04ada9 Merge Localisation/master into OpenRCT2/develop 2024-02-14 04:01:42 +00:00
OpenRCT2 git bot 64787ff91f Merge Localisation/master into OpenRCT2/develop 2024-02-13 04:01:45 +00:00
Michael Steenbeek 48a8d484cf
en-GB: Remove old music style strings 
These are no longer used, as they have been moved to objects.
 2024-02-12 23:01:31 +01:00
OpenRCT2 git bot 72ca04633e Merge Localisation/master into OpenRCT2/develop 2024-02-12 04:01:42 +00:00
Michael Steenbeek 70b9d0ca47
Add button to reload object 2024-02-11 20:45:31 +00:00
OpenRCT2 git bot 26bdaebe4f Merge Localisation/master into OpenRCT2/develop 2024-02-11 04:01:39 +00:00
OpenRCT2 git bot 08fbdd1552 Merge Localisation/master into OpenRCT2/develop 2024-02-05 04:02:06 +00:00
OpenRCT2 git bot a6e5d5b192 Merge Localisation/master into OpenRCT2/develop 2024-02-04 04:01:46 +00:00
OpenRCT2 git bot 328c397718 Merge Localisation/master into OpenRCT2/develop 2024-02-02 04:02:02 +00:00
OpenRCT2 git bot 13fc351591 Merge Localisation/master into OpenRCT2/develop 2024-02-01 04:01:39 +00:00
OpenRCT2 git bot 8abda17cb3 Merge Localisation/master into OpenRCT2/develop 2024-01-31 04:01:41 +00:00
Matt fc1b580074
Merge pull request #21244 from pfroud/add-error-strings 
Add error strings to reduce how many `GameActions::Result`s have `STR_NONE, STR_NONE`
 2024-01-29 18:02:37 +02:00
OpenRCT2 git bot db2a8af3cb Merge Localisation/master into OpenRCT2/develop 2024-01-23 04:01:46 +00:00
Peter Froud 648941aa11 Add constants to StringIds.h and en-GB.txt 2024-01-22 01:47:14 -08:00
OpenRCT2 git bot 2cb4eb950b Merge Localisation/master into OpenRCT2/develop 2024-01-20 04:01:41 +00:00
OpenRCT2 git bot b50f1c91d9 Merge Localisation/master into OpenRCT2/develop 2024-01-19 04:01:49 +00:00
OpenRCT2 git bot ece7601532 Merge Localisation/master into OpenRCT2/develop 2024-01-17 04:01:39 +00:00
OpenRCT2 git bot 717682a21f Merge Localisation/master into OpenRCT2/develop 2024-01-16 04:01:40 +00:00
OpenRCT2 git bot 739dd712d5 Merge Localisation/master into OpenRCT2/develop 2024-01-13 04:01:44 +00:00
HtotheTML 50cf1aed67
Fix Inca Lost City’s scenario description 
The scenario Inca Lost City from the Wacky Worlds expansion states that there are height restrictions. Since there aren't, I've removed the corresponding text.
 2024-01-11 21:17:58 +00:00
OpenRCT2 git bot 872b28c8d8 Merge Localisation/master into OpenRCT2/develop 2024-01-07 04:01:46 +00:00
OpenRCT2 git bot 5e42714f80 Merge Localisation/master into OpenRCT2/develop 2023-12-31 04:01:37 +00:00
OpenRCT2 git bot 02df5f8367 Merge Localisation/master into OpenRCT2/develop 2023-12-30 04:02:03 +00:00
OpenRCT2 git bot 689d16b501 Merge Localisation/master into OpenRCT2/develop 2023-12-23 04:01:35 +00:00
OpenRCT2 git bot b7bf844659 Merge Localisation/master into OpenRCT2/develop 2023-12-21 04:01:53 +00:00
OpenRCT2 git bot 89472a55ae Merge Localisation/master into OpenRCT2/develop 2023-12-20 04:01:36 +00:00
Fredrik Tegnell 3f5d4b8941
Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window (#21058) 
* Close OpenRCT2/OpenRCT2#20830: Display author field on scenery window

* Apply code formatting fixes

* Apply code formatting fixes

* Fix code review changes
 2023-12-19 21:15:04 -03:00
OpenRCT2 git bot a467be257b Merge Localisation/master into OpenRCT2/develop 2023-12-16 04:01:37 +00:00
OpenRCT2 git bot 09cf5b37d2 Merge Localisation/master into OpenRCT2/develop 2023-12-12 04:01:38 +00:00
mrmbernardi 4b0b2a48f6
Fixed shader formatting in applytransparency.frag (#21071) 2023-12-09 18:42:41 +00:00
mrmbernardi 5b42da2646
Add clang format for shaders (#21066) 2023-12-08 13:02:43 +01:00
Michael Bernardi 8c7d1d149a Added OpenGL TTF hinting 2023-12-08 01:13:17 +01:00
Michael Bernardi f64706e1d9 Add insetting and outlining to OpenGL TTF rendering 2023-12-08 01:13:17 +01:00
OpenRCT2 git bot 6aa7e91917 Merge Localisation/master into OpenRCT2/develop 2023-11-16 04:01:38 +00:00
OpenRCT2 git bot f98674b023 Merge Localisation/master into OpenRCT2/develop 2023-11-15 04:01:43 +00:00
OpenRCT2 git bot 3ab33d3ca9 Merge Localisation/master into OpenRCT2/develop 2023-11-13 04:01:49 +00:00
Fredrik Tegnell af7086e283
Close #12078: Add shortcut key for sloping walls (#20860) 
* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Apply code formatting fixes

* Apply code formatting fixes

* Apply modulus operator to make code more concise

* Change string ID

* Apply code formatting fix

* Apply code formatting fix
 2023-11-12 08:10:56 -03:00
OpenRCT2 git bot f1fdeb1f2b Merge Localisation/master into OpenRCT2/develop 2023-11-08 04:01:45 +00:00
Gymnasiast 6d87e3e56d
Make remove_park_fences multiplayer-safe 2023-11-02 22:40:11 +01:00
OpenRCT2 git bot 162b17ddc8 Merge Localisation/master into OpenRCT2/develop 2023-11-01 04:01:53 +00:00
OpenRCT2 git bot f5649870ee Merge Localisation/master into OpenRCT2/develop 2023-10-31 04:01:51 +00:00
OpenRCT2 git bot 3b027a80f2 Merge Localisation/master into OpenRCT2/develop 2023-09-09 04:01:50 +00:00
OpenRCT2 git bot f453cffb8e Merge Localisation/master into OpenRCT2/develop 2023-09-03 04:01:52 +00:00
OpenRCT2 git bot e74808b94f Merge Localisation/master into OpenRCT2/develop 2023-08-30 04:08:48 +00:00
OpenRCT2 git bot 92d047161f Merge Localisation/master into OpenRCT2/develop 2023-07-21 04:02:04 +00:00
OpenRCT2 git bot 3988768b2f Merge Localisation/master into OpenRCT2/develop 2023-07-05 04:02:05 +00:00
OpenRCT2 git bot 067090b297 Merge Localisation/master into OpenRCT2/develop 2023-06-28 04:02:07 +00:00
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