1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Commit Graph

2246 Commits

Author SHA1 Message Date
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