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

2268 Commits

Author SHA1 Message Date
OpenRCT2 git bot 447805c8f4 Merge Localisation/master into OpenRCT2/develop 2024-04-19 04:01:52 +00:00
OpenRCT2 git bot 73fc3bce8c Merge Localisation/master into OpenRCT2/develop 2024-04-18 04:01:49 +00:00
OpenRCT2 git bot 0872327fe5 Merge Localisation/master into OpenRCT2/develop 2024-04-14 04:04:33 +00:00
OpenRCT2 git bot 0d12eb657d Merge Localisation/master into OpenRCT2/develop 2024-04-13 04:01:36 +00:00
Michael Steenbeek 005aece802
Expose “animation is backwards” flag in Tile Inspector 2024-04-12 18:08:34 +00:00
OpenRCT2 git bot 828eb0e467 Merge Localisation/master into OpenRCT2/develop 2024-04-07 04:02:09 +00:00
Peter Froud 322321645b
Add `STR_ERR_INVALID_COLOUR` 2024-03-30 17:15:14 +01:00
Michael Steenbeek 457d40bf2b
Merge pull request #21642 from Gymnasiast/feature/classic-standup-2024 
Add Classic Stand-Up Roller Coaster
 2024-03-26 00:28:19 +01:00
OpenRCT2 git bot 2b2091130b Merge Localisation/master into OpenRCT2/develop 2024-03-23 04:01:49 +00:00
ZeeMaji d94ebee33e
Add improved description 2024-03-22 17:30:02 +01:00
Gymnasiast cd5c56d811
Add Classic Stand-Up Roller Coaster 2024-03-22 17:30:01 +01:00
Andrew a972d231d7
Add shortcut key for sorting tile elements (#21636) 2024-03-22 15:24:10 +01:00
OpenRCT2 git bot 51b0143b2d Merge Localisation/master into OpenRCT2/develop 2024-03-22 04:01:40 +00:00
OpenRCT2 git bot c858b3a8c1 Merge Localisation/master into OpenRCT2/develop 2024-03-15 04:02:01 +00:00
Jan Kelemen 9bb678688e
Fix #21434: Number of guests overflows in objective text 2024-03-14 19:49:57 +01:00
OpenRCT2 git bot 15650ad184 Merge Localisation/master into OpenRCT2/develop 2024-03-14 04:01:42 +00:00
OpenRCT2 git bot 470667ed28 Merge Localisation/master into OpenRCT2/develop 2024-03-12 04:01:51 +00:00
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