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

2009 Commits

Author SHA1 Message Date
OpenRCT2 git bot c30d574480 Merge Localisation/master into OpenRCT2/develop 2021-11-29 04:09:27 +00:00
OpenRCT2 git bot 4ddd606d63 Merge Localisation/master into OpenRCT2/develop 2021-11-25 04:08:51 +00:00
IntelOrca 34128dc262
Add new .park save format 
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
Co-authored-by: ZehMatt <Zehmatt@users.noreply.github.com>
Co-authored-by: Broxzier <Broxzier@users.noreply.github.com>
 2021-11-21 22:43:22 +01:00
Michael Steenbeek ae164e5228
Close #14888: Change Esperanto code 2021-11-20 22:26:41 +01:00
OpenRCT2 git bot f1a5b718e3 Merge Localisation/master into OpenRCT2/develop 2021-11-20 04:08:36 +00:00
OpenRCT2 git bot 4a8af923a3 Merge Localisation/master into OpenRCT2/develop 2021-11-18 04:08:39 +00:00
hjort96 072597f080
Close #12825: Show object rotation in Tile Inspector 2021-11-16 23:16:59 +01:00
OpenRCT2 git bot eac74de3ce Merge Localisation/master into OpenRCT2/develop 2021-11-10 04:08:58 +00:00
chrhaase 4ff0022c58
Fix #15844: Tile Inspector inconsistent text colour 
`COLOUR_WHITE` was being passed as the colour when drawing
any text. The Options window uses the `rct_window::colours`
array for resolving the correct theme colour.
Replacing all occurrences of `COLOUR_WHITE` with
`w->colours[1]` makes the text colours more consistent.
In the details section values are still painted in black
no matter the colour theme, which is consistent with e.g.
the park information window.
 2021-11-09 09:11:48 +01:00
OpenRCT2 git bot efa40b119a Merge Localisation/master into OpenRCT2/develop 2021-11-04 04:08:47 +00:00
OpenRCT2 git bot 8b724cd998 Merge Localisation/master into OpenRCT2/develop 2021-11-03 04:08:44 +00:00
OpenRCT2 git bot 22408ee4b6 Merge Localisation/master into OpenRCT2/develop 2021-11-01 04:08:42 +00:00
OpenRCT2 git bot 86f91585d2 Merge Localisation/master into OpenRCT2/develop 2021-10-28 04:08:32 +00:00
OpenRCT2 git bot 5eeb970787 Merge Localisation/master into OpenRCT2/develop 2021-10-27 04:08:56 +00:00
OpenRCT2 git bot 2146abb17f Merge Localisation/master into OpenRCT2/develop 2021-10-26 04:08:51 +00:00
OpenRCT2 git bot 72439c28d2 Merge Localisation/master into OpenRCT2/develop 2021-10-23 04:08:27 +00:00
OpenRCT2 git bot 14c5f13b18 Merge Localisation/master into OpenRCT2/develop 2021-10-21 04:08:57 +00:00
OpenRCT2 git bot 36a0a28e3f Merge Localisation/master into OpenRCT2/develop 2021-10-05 04:08:34 +00:00
OpenRCT2 git bot b7bda6e938 Merge Localisation/master into OpenRCT2/develop 2021-10-02 04:08:15 +00:00
OpenRCT2 git bot c284aa2ce2 Merge Localisation/master into OpenRCT2/develop 2021-09-29 04:08:29 +00:00
OpenRCT2 git bot fddf009afc Merge Localisation/master into OpenRCT2/develop 2021-09-21 04:08:19 +00:00
OpenRCT2 git bot 99e3883b6e Merge Localisation/master into OpenRCT2/develop 2021-09-19 04:07:58 +00:00
OpenRCT2 git bot 16472a400f Merge Localisation/master into OpenRCT2/develop 2021-09-16 04:07:59 +00:00
OpenRCT2 git bot 3f8f78ac8f Merge Localisation/master into OpenRCT2/develop 2021-09-14 04:11:10 +00:00
Kane b35fd28c55
Feature #7682: Lock camera to vehicle in main window 
Pressing the "Locate" button in the Ride window when selected on a "Vehicle/Train" will now have the main viewport track the vehicle.
 2021-09-13 20:44:52 +02:00
OpenRCT2 git bot e2841477bd Merge Localisation/master into OpenRCT2/develop 2021-09-10 04:08:27 +00:00
OpenRCT2 git bot c6e4dc5ef1 Merge Localisation/master into OpenRCT2/develop 2021-09-07 04:08:07 +00:00
OpenRCT2 git bot fc189f8c7d Merge Localisation/master into OpenRCT2/develop 2021-09-06 04:08:02 +00:00
Hielke Morsink 8ae918118a
Add a bug-report item in file dropdown menu 2021-09-05 15:25:44 +02:00
OpenRCT2 git bot 91ca2e58bc Merge Localisation/master into OpenRCT2/develop 2021-09-03 04:08:05 +00:00
OpenRCT2 git bot d8997cd60f Merge Localisation/master into OpenRCT2/develop 2021-08-21 04:07:57 +00:00
OpenRCT2 git bot 31ccac8354 Merge Localisation/master into OpenRCT2/develop 2021-08-08 04:07:52 +00:00
OpenRCT2 git bot 3503a433dc Merge Localisation/master into OpenRCT2/develop 2021-08-02 04:07:54 +00:00
Ted John d78deacb6d
Fix park value objective string for currency 64 2021-08-01 15:14:43 +02:00
Kane bd8d3934e0
Close #15143: Add a shortcut key for Giant Screenshot 2021-08-01 09:20:34 +02:00
OpenRCT2 git bot 660a5f9b02 Merge Localisation/master into OpenRCT2/develop 2021-08-01 04:07:50 +00:00
OpenRCT2 git bot 292b8b9ab7 Merge Localisation/master into OpenRCT2/develop 2021-07-31 04:07:58 +00:00
Duncan 465d1c5414
Cleanup of Banner related actions (#15126) 
* Close #15107. Use correct type and provide appropriate error messages

* Add further error messages to actions

* Apply review comments
 2021-07-30 20:53:13 +01:00
OpenRCT2 git bot 2eb1ee631b Merge Localisation/master into OpenRCT2/develop 2021-07-30 04:08:04 +00:00
OpenRCT2 git bot d01a3a783a Merge Localisation/master into OpenRCT2/develop 2021-07-29 04:07:50 +00:00
Michael Steenbeek ab18612882
Remove Music Acknowledgements window (#15116) 
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
 2021-07-28 10:26:35 +02:00
OpenRCT2 git bot 6bbc2fb4fe Merge Localisation/master into OpenRCT2/develop 2021-07-28 04:07:35 +00:00
OpenRCT2 git bot 399bd15d5e Merge Localisation/master into OpenRCT2/develop 2021-07-27 04:07:29 +00:00
OpenRCT2 git bot 8b9129d9f3 Merge Localisation/master into OpenRCT2/develop 2021-07-21 04:07:43 +00:00
OpenRCT2 git bot 707d4156bc Merge Localisation/master into OpenRCT2/develop 2021-07-07 04:07:54 +00:00
OpenRCT2 git bot 2650828f08 Merge Localisation/master into OpenRCT2/develop 2021-06-28 04:07:26 +00:00
Hielke Morsink acd45e6f75
Redesign About window (#14841) 2021-06-26 10:54:38 +02:00
OpenRCT2 git bot 9383fcef41 Merge Localisation/master into OpenRCT2/develop 2021-06-16 04:07:56 +00:00
OpenRCT2 git bot c1c9353dd2 Merge Localisation/master into OpenRCT2/develop 2021-06-06 05:00:05 +00:00
OpenRCT2 git bot 5b5aa0771e Merge Localisation/master into OpenRCT2/develop 2021-05-29 05:52:24 +00:00
OpenRCT2 git bot 4c1ab8d934 Merge Localisation/master into OpenRCT2/develop 2021-05-28 05:22:13 +00:00
Gymnasiast b214a9fd97
Show what a stall sells in Object Selection 2021-05-27 19:54:44 +02:00
Gymnasiast f2ac658935
Show tracks list of music styles in Object Selection 2021-05-27 19:53:52 +02:00
Michael Steenbeek 4be838a9b8
Reserve strings for the new-save-format branch 
Avoiding constant merge conflicts
 2021-05-27 19:52:11 +02:00
OpenRCT2 git bot 1b11e691c9 Merge Localisation/master into OpenRCT2/develop 2021-05-26 04:43:40 +00:00
OpenRCT2 git bot 15bb5f53f8 Merge Localisation/master into OpenRCT2/develop 2021-05-25 04:28:28 +00:00
Gymnasiast 8f6713a4f1
Reverse option, add shortcut 2021-05-24 16:54:30 +02:00
Gymnasiast 89eae5198b
Add option to make water opaque 2021-05-24 16:39:39 +02:00
OpenRCT2 git bot 217b5a5c48 Merge Localisation/master into OpenRCT2/develop 2021-05-12 04:13:26 +00:00
OpenRCT2 git bot c20bb2b8aa Merge Localisation/master into OpenRCT2/develop 2021-05-02 04:11:56 +00:00
OpenRCT2 git bot 0bb5d453a4 Merge Localisation/master into OpenRCT2/develop 2021-04-02 04:05:31 +00:00
OpenRCT2 git bot 7c33a31d3a Merge Localisation/master into OpenRCT2/develop 2021-04-01 04:02:31 +00:00
Gymnasiast 69f7ad35fc
en-GB: Use real multiplication sign instead of x 2021-03-31 14:37:35 +02:00
OpenRCT2 git bot 6bff0fb1a1 Merge Localisation/master into OpenRCT2/develop 2021-03-30 04:02:43 +00:00
OpenRCT2 git bot dd7258eb33 Merge Localisation/master into OpenRCT2/develop 2021-03-29 04:04:12 +00:00
OpenRCT2 git bot 7c78a2b8c3 Merge Localisation/master into OpenRCT2/develop 2021-03-28 04:03:42 +00:00
Geoff B 6c8493cb69
Close #14253: Replace font size tokens with adjusted DrawText calls 2021-03-27 14:40:17 +01:00
Michael Steenbeek 713410ab6c
Apply changed strings from the new-save-format branch 2021-03-27 14:31:13 +01:00
OpenRCT2 git bot e8e30e9c6a Merge Localisation/master into OpenRCT2/develop 2021-03-27 04:02:43 +00:00
OpenRCT2 git bot 4631c22a3c Merge Localisation/master into OpenRCT2/develop 2021-03-21 04:05:54 +00:00
OpenRCT2 git bot cc68b8bf4d Merge Localisation/master into OpenRCT2/develop 2021-03-15 04:06:00 +00:00
manatails 4fe5b1dc79
Add "Vandals stopped" stat for security guards (#14071) 
* Add a stat for security guards: Vandals stopped

* Update src/openrct2-ui/windows/Staff.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* Update src/openrct2/peep/Guest.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* No need to update screenCoords at the last line

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

* Add changelog entry and bump network version

* Update to new UI code

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-03-14 09:18:35 -03:00
OpenRCT2 git bot 72b6160b65 Merge Localisation/master into OpenRCT2/develop 2021-03-14 04:05:51 +00:00
OpenRCT2 git bot 32ce6c9b4b Merge Localisation/master into OpenRCT2/develop 2021-03-13 04:06:03 +00:00
OpenRCT2 git bot cffb467a77 Merge Localisation/master into OpenRCT2/develop 2021-03-11 04:06:01 +00:00
OpenRCT2 git bot 245c9679e3 Merge Localisation/master into OpenRCT2/develop 2021-03-09 04:05:56 +00:00
OpenRCT2 git bot de7e378216 Merge Localisation/master into OpenRCT2/develop 2021-03-07 04:05:55 +00:00
Ted John 966129dd7c
Remove network traffic window 
Now available in the DevTools plugin.
 2021-03-06 14:47:06 +01:00
Ted John b179f6e597
Merge pull request #13965 from telk5093/footpath_hotkeys 
Make ride construction shortcuts work for footpath too
 2021-03-06 01:27:18 +00:00
TELK 57a9b0f85e Change Ride construction strings into "Construction" 2021-03-04 18:06:49 +09:00
OpenRCT2 git bot 723aa9b654 Merge Localisation/master into OpenRCT2/develop 2021-03-01 04:06:01 +00:00
OpenRCT2 git bot 03d6771cce Merge Localisation/master into OpenRCT2/develop 2021-02-26 04:05:52 +00:00
OpenRCT2 git bot 2733447387 Merge Localisation/master into OpenRCT2/develop 2021-02-25 04:05:56 +00:00
Ted John faf7f5706f
Merge pull request #14158 from IntelOrca/fix/14149-shortcuts-save 
Fix #14149: Numpad shortcut keys are not loaded correctly
Fix #14160: Game crashs when registering shortcuts
Fix #14161: ShortcutDesc.bindings does not work
 2021-02-24 22:19:30 +00:00
OpenRCT2 git bot 9e4553c5b6 Merge Localisation/master into OpenRCT2/develop 2021-02-24 04:04:59 +00:00
Ted John aedd93ef33 Add remove button to clear a shortcut 2021-02-23 21:34:32 +00:00
Michael Steenbeek 0cdbc99984
Merge pull request #13848 from IntelOrca/refactor/shortcut-engine 
Introduce new shortcut engine
 2021-02-21 14:01:39 +01:00
OpenRCT2 git bot 12ffca22a7 Merge Localisation/master into OpenRCT2/develop 2021-02-21 04:05:36 +00:00
Ted John 2b14fe9d7f Update shortcut listings 2021-02-21 03:14:19 +00:00
Ted John 550766698d Make shortcut strings title case 2021-02-21 03:14:19 +00:00
Ted John ff86ebbfe5 Localise shortcut strings 2021-02-21 03:14:19 +00:00
OpenRCT2 git bot c0839e1b88 Merge Localisation/master into OpenRCT2/develop 2021-02-12 04:05:48 +00:00
OpenRCT2 git bot 6e5b4726a3 Merge Localisation/master into OpenRCT2/develop 2021-02-09 04:05:23 +00:00
OpenRCT2 git bot c35b1cf423 Merge Localisation/master into OpenRCT2/develop 2021-02-03 04:07:13 +00:00
OpenRCT2 git bot 6eb0d3cc28 Merge Localisation/master into OpenRCT2/develop 2021-02-02 04:11:12 +00:00
Umdlye 2c408342d9
Create toggle for zoom toolbar button 2021-02-01 17:27:40 +01:00
OpenRCT2 git bot 4218766729 Merge Localisation/master into OpenRCT2/develop 2021-02-01 04:10:33 +00:00
OpenRCT2 git bot 418b6f9a54 Merge Localisation/master into OpenRCT2/develop 2021-01-30 04:09:25 +00:00
OpenRCT2 git bot a49a2fdd85 Merge Localisation/master into OpenRCT2/develop 2021-01-27 04:08:46 +00:00
OpenRCT2 git bot 7d90df1baa Merge Localisation/master into OpenRCT2/develop 2021-01-24 04:35:00 +00:00
OpenRCT2 git bot cf83752ce4 Merge Localisation/master into OpenRCT2/develop 2021-01-21 04:33:38 +00:00
OpenRCT2 git bot bd27046142 Merge Localisation/master into OpenRCT2/develop 2021-01-18 04:30:01 +00:00
OpenRCT2 git bot fb4d14e843 Merge Localisation/master into OpenRCT2/develop 2021-01-16 04:28:43 +00:00
OpenRCT2 git bot baaf686eef Merge Localisation/master into OpenRCT2/develop 2021-01-14 04:31:10 +00:00
OpenRCT2 git bot 5c33773807 Merge Localisation/master into OpenRCT2/develop 2021-01-13 04:31:57 +00:00
OpenRCT2 git bot e51a048add Merge Localisation/master into OpenRCT2/develop 2021-01-12 04:28:33 +00:00
OpenRCT2 git bot e2021fcbce Merge Localisation/master into OpenRCT2/develop 2021-01-11 04:29:22 +00:00
OpenRCT2 git bot ef6a80982a Merge Localisation/master into OpenRCT2/develop 2021-01-10 04:29:24 +00:00
OpenRCT2 git bot 005bc3c360 Merge Localisation/master into OpenRCT2/develop 2021-01-07 04:23:49 +00:00
X123M3-256 deca5a3881
Add "Single Rail Roller Coaster" ride type 2021-01-06 21:10:15 +01:00
OpenRCT2 git bot 017f7ef9e4 Merge Localisation/master into OpenRCT2/develop 2021-01-06 04:21:33 +00:00
OpenRCT2 git bot fd37700433 Merge Localisation/master into OpenRCT2/develop 2021-01-05 04:20:44 +00:00
OpenRCT2 git bot f8c0aea9e2 Merge Localisation/master into OpenRCT2/develop 2021-01-04 04:20:10 +00:00
Gymnasiast 52bc650abf
Improve feedback when selecting the wrong file 2021-01-03 18:40:02 +01:00
Gymnasiast 07c3a930e4
Apply review requests 2021-01-03 17:53:38 +01:00
Keith Stellyes 268e39d12a
GOG installer extraction for POSIX 2021-01-03 17:53:14 +01:00
Michael Steenbeek 44d595835a
Fix #13653: Incorrect colours in Inventions List 2021-01-03 14:06:52 +01:00
OpenRCT2 git bot 920dd756f3 Merge Localisation/master into OpenRCT2/develop 2021-01-03 04:18:46 +00:00
OpenRCT2 git bot b5aaab58fc Merge Localisation/master into OpenRCT2/develop 2020-12-24 04:16:47 +00:00
Gymnasiast 17fe4bd7ea
en-GB: Replace typewriter quotes with typographical ones 2020-12-23 21:03:12 +01:00
OpenRCT2 git bot baf1924b25 Merge Localisation/master into OpenRCT2/develop 2020-12-21 04:09:34 +00:00
OpenRCT2 git bot 150f243a9f Merge Localisation/master into OpenRCT2/develop 2020-12-20 04:06:03 +00:00
Łukasz Pękalski 9ec61fa5d2
Close #12993: Remove hardcoded {SMALLFONT}{BLACK} from tooltips 2020-12-19 20:53:57 +01:00
OpenRCT2 git bot 4ee47b18a0 Merge Localisation/master into OpenRCT2/develop 2020-12-19 04:07:36 +00:00
OpenRCT2 git bot 24f2a12e53 Merge Localisation/master into OpenRCT2/develop 2020-12-18 04:08:07 +00:00
OpenRCT2 git bot dea4792509 Merge Localisation/master into OpenRCT2/develop 2020-12-17 04:06:09 +00:00
OpenRCT2 git bot f1e19edb78 Merge Localisation/master into OpenRCT2/develop 2020-12-16 04:06:07 +00:00
OpenRCT2 git bot b60d418601 Merge Localisation/master into OpenRCT2/develop 2020-12-15 04:05:46 +00:00
OpenRCT2 git bot d246e4a9c9 Merge Localisation/master into OpenRCT2/develop 2020-12-14 04:05:58 +00:00
OpenRCT2 git bot 9cefafd117 Merge Localisation/master into OpenRCT2/develop 2020-12-08 04:06:02 +00:00
OpenRCT2 git bot 80f442c706 Merge Localisation/master into OpenRCT2/develop 2020-12-07 04:06:01 +00:00
OpenRCT2 git bot e8611169a5 Merge Localisation/master into OpenRCT2/develop 2020-12-05 04:05:30 +00:00
Ted John d58d834925
Merge pull request #13212 from IntelOrca/new-format-string 
Eradicate all coded format tokens. All internal strings now contain raw tokens such as `{STRINGID}` and `{RED}`. New iterators have been created to iterate the tokens and the UTF-8 codepoints.

Formatting strings has been re-written and a new template version is available.
 2020-12-04 13:56:54 +00:00
OpenRCT2 git bot 6db4a4531e Merge Localisation/master into OpenRCT2/develop 2020-12-03 04:05:29 +00:00
OpenRCT2 git bot aa8a08987f Merge Localisation/master into OpenRCT2/develop 2020-12-02 04:05:38 +00:00
Ted John 4187106303 Fix #13482: STR_6308 incorrect for en-GB 2020-12-01 22:03:30 +00:00
OpenRCT2 git bot a7481b40b4 Merge Localisation/master into OpenRCT2/develop 2020-11-29 04:05:34 +00:00
OpenRCT2 git bot 9c27e3a9ce Merge Localisation/master into OpenRCT2/develop 2020-11-28 04:05:47 +00:00
OpenRCT2 git bot 79c6b22600 Merge Localisation/master into OpenRCT2/develop 2020-11-27 04:05:17 +00:00
OpenRCT2 git bot 8328f7bd64 Merge Localisation/master into OpenRCT2/develop 2020-11-24 04:05:54 +00:00
OpenRCT2 git bot 499631bf72 Merge Localisation/master into OpenRCT2/develop 2020-11-21 04:04:38 +00:00
OpenRCT2 git bot 10b7143d53 Merge Localisation/master into OpenRCT2/develop 2020-11-17 04:04:31 +00:00
Michael Steenbeek 23871de19f
Remove built-in explode guests cheat 2020-11-16 22:07:52 +01:00
OpenRCT2 git bot cf7ce2d921 Merge Localisation/master into OpenRCT2/develop 2020-11-10 04:04:08 +00:00
OpenRCT2 git bot d61e81bded Merge Localisation/master into OpenRCT2/develop 2020-11-09 04:05:34 +00:00
Michael Steenbeek 1785be9b09
STR_6399: Fix quotes 2020-11-08 18:06:56 +01:00
Gymnasiast 75de0790bc
Improve message when asking for a game_path with no filepicker available 2020-11-08 14:32:58 +01:00
OpenRCT2 git bot 135245d744 Merge Localisation/master into OpenRCT2/develop 2020-11-08 04:05:23 +00:00
OpenRCT2 git bot 7897fb1829 Merge Localisation/master into OpenRCT2/develop 2020-11-04 04:04:58 +00:00
OpenRCT2 git bot 7346321f58 Merge Localisation/master into OpenRCT2/develop 2020-11-01 19:47:17 +01:00
Duncan dcabc8451e
Fix #13250: Crash when opening parks with new ride types (#13256) 
This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist.

Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
 2020-11-01 14:49:43 +01:00
OpenRCT2 git bot 267de7cd2a Merge Localisation/master into OpenRCT2/develop 2020-11-01 04:04:17 +00:00
OpenRCT2 git bot 4471bd8354 Merge Localisation/master into OpenRCT2/develop 2020-10-31 04:03:58 +00:00
OpenRCT2 git bot d1bf532af5 Merge Localisation/master into OpenRCT2/develop 2020-10-30 04:03:52 +00:00
OpenRCT2 git bot bbf91d9613 Merge Localisation/master into OpenRCT2/develop 2020-10-29 04:06:47 +00:00
OpenRCT2 git bot 2e55b680c5 Merge Localisation/master into OpenRCT2/develop 2020-10-28 04:06:40 +00:00
OpenRCT2 git bot 6df7958e54 Merge Localisation/master into OpenRCT2/develop 2020-10-27 04:06:35 +00:00
OpenRCT2 git bot dedb244cee Merge Localisation/master into OpenRCT2/develop 2020-10-26 04:06:30 +00:00
OpenRCT2 git bot 7053413da5 Merge Localisation/master into OpenRCT2/develop 2020-10-25 04:06:17 +00:00
OpenRCT2 git bot fe5ee422a2 Merge Localisation/master into OpenRCT2/develop 2020-10-24 04:05:55 +00:00
Michael Steenbeek 14512e72a3
en-GB: Remove overrides for JSON objects; add Panda World 2020-10-23 22:14:28 +02:00
OpenRCT2 git bot dd7c27f4e6 Merge Localisation/master into OpenRCT2/develop 2020-10-22 04:05:53 +00:00
Łukasz Pękalski 9dcbf6d4e6
Close #4865: Offer an option to disable inhibiting the monitor power (#13243) 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2020-10-20 22:02:44 +02:00
OpenRCT2 git bot e2d3b1d3bc Merge Localisation/master into OpenRCT2/develop 2020-10-18 04:05:30 +00:00
OpenRCT2 git bot 803bbfeeb0 Merge Localisation/master into OpenRCT2/develop 2020-10-17 04:05:49 +00:00
Aaron van Geffen af26a2cef0
Improve park cheats tab layout (#13186) 
* Remove 'Park parameters…' button
  The scenario options are already accessible through the cheats menu

* Split off Objective group from General group
* Split off new Maintenance group from Staff group

* Shrink 'Force park rating' spinner to make room for label
* Change label 'Force weather' to 'Change weather to'
* Change label "Plants don't age" to 'Disable plants withering'
* Change some strings for consistent capitalisation
 2020-10-16 21:52:27 +02:00
OpenRCT2 git bot cbfbaddb92 Merge Localisation/master into OpenRCT2/develop 2020-10-16 04:05:55 +00:00
OpenRCT2 git bot 01d57872fe Merge Localisation/master into OpenRCT2/develop 2020-10-14 04:05:25 +00:00
OpenRCT2 git bot bd96d312a7 Merge Localisation/master into OpenRCT2/develop 2020-10-13 04:05:23 +00:00
OpenRCT2 git bot 9e84fda814 Merge Localisation/master into OpenRCT2/develop 2020-10-12 04:05:30 +00:00
Gymnasiast 16ca892449
Add Objective Options to Cheats menu 2020-10-11 19:28:25 +02:00
OpenRCT2 git bot ec2eae75e2 Merge Localisation/master into OpenRCT2/develop 2020-10-11 04:05:16 +00:00
X123M3-256 9681ea4cea
Add "Hybrid Coaster" ride type (#12110) 
* Add "Hybrid coaster" ride type

* Add turns

* Add diagonal slopes

* Add bank transitions

* Add diagonal bank transitions

* Add banked turns

* Add sloped turns

* Add sloped bank transitions

* Add sloped banked turns

* Add s bends

* Add helices

* Add barrel rolls

* Add half loops

* Start changing supports to wooden

* Switch diagonals and banked turns to wooden supports

* Finish switching supports to wooden

* Alter default supports for small turns and steep turns

* Split track sprites that were glitching

* Fix incorrect sprite indices on small helices

* Add supports for large flat to steep pieces

* Fix bug with b supports

* Add supports for quarter loops

* Finalize set of track elements

* Fix strange colors when track piece is highlighted

* Update sprites.json

* Add support for corkscrews

* Fix incorrect remap colors and default supports

* Add slope to banked turn transitions

* Add support for preview image in color selection window

* Fix static glitches

* Correct Z offset

* Set segment heights (and fix more static glitches)

* Improve sloped curve supports

* Fix slope to banked turn transitions

* Fix dynamic glitches

* Fix boosters

* Remove corkscrews

* Set ride data and implement ride rating function

* Fix glitches on steep turns and gentle to steep

* Format code

* Add sprites

* Add track color preview image

* Fix formatting

* Add files to MSVC project

* Fix Testpaint

* Revert removal of RIDE_TYPE_50 from GetClassification

* Introduce constant instead of hard coded number

* Fix stray change

* Improve legibility of ride_ratings_calculate_hybrid_coaster()

* Fix comments on byte_97B23C

* Fix two other stray changes

* Fix Xcode project

* Adjust bounding boxes to make clipping behaviour more consistent

* Fix two glitches on medium and large turns

* Address comments from DuncansPumpkin

* Fix incorrect ride ID

* Fix steep turn sprites

* Run PNG images through OptiPNG

* Update changelog

* Fix namespace error

* Use arrays for supports to handle additional elements

* Rename functions to TitleCase and add namespace

* Increment network version

Co-authored-by: Edward Calver <hx010973@reading.ac.uk>
Co-authored-by: tylerleamon <59478575+tylerleamon@users.noreply.github.com>
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-10-10 20:27:12 +01:00
OpenRCT2 git bot 63d536a10e Merge Localisation/master into OpenRCT2/develop 2020-10-10 04:05:24 +00:00
Keith Stellyes 3468d1fc6b
Close #13125: Selecting the RCT2 files now uses localised dialogs 2020-10-09 21:13:14 +02:00
OpenRCT2 git bot 6ce60498c7 Merge Localisation/master into OpenRCT2/develop 2020-10-08 04:04:42 +00:00
Tulio Leao 2dfef7f476
Close #13107: Use ellipsis over three consecutive dots 2020-10-07 10:21:05 +02:00
OpenRCT2 git bot 74d4182c95 Merge Localisation/master into OpenRCT2/develop 2020-10-06 04:05:15 +00:00
OpenRCT2 git bot f461b42ee6 Merge Localisation/master into OpenRCT2/develop 2020-10-05 04:05:40 +00:00
OpenRCT2 git bot a284119990 Merge Localisation/master into OpenRCT2/develop 2020-10-04 04:05:10 +00:00
Michael Steenbeek 01146123ca
en-GB: Fix strings introduced in #13066 2020-10-03 22:11:11 +02:00
Tulio Leao f4b588256d
Merge pull request #13066 from tupaschoal/fix-5904 
Light Tile Inspector Improvements
 2020-10-03 15:16:10 -03:00
Tulio Leao e4d72cefaa Fix #5904: Empty errors on tile inspector base height change 2020-10-02 01:06:54 -03:00
OpenRCT2 git bot d33ddaba2c Merge Localisation/master into OpenRCT2/develop 2020-10-02 04:05:11 +00:00
OpenRCT2 git bot e9483ad6f0 Merge Localisation/master into OpenRCT2/develop 2020-09-29 04:05:04 +00:00
OpenRCT2 git bot 0297d0bef3 Merge Localisation/master into OpenRCT2/develop 2020-09-28 04:07:02 +00:00
OpenRCT2 git bot e882e9003c Merge Localisation/master into OpenRCT2/develop 2020-09-24 04:04:44 +00:00
OpenRCT2 git bot 1a815584ab Merge Localisation/master into OpenRCT2/develop 2020-09-20 04:04:43 +00:00
OpenRCT2 git bot 27a7ca778f Merge Localisation/master into OpenRCT2/develop 2020-09-17 04:04:39 +00:00
OpenRCT2 git bot 564cc7b635 Merge Localisation/master into OpenRCT2/develop 2020-09-16 04:04:36 +00:00
Brett c9de4f49fe
Add snow as a weather type 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-09-14 21:58:00 +02:00
OpenRCT2 git bot 5fb6c57a5d Merge Localisation/master into OpenRCT2/develop 2020-09-01 04:04:29 +00:00
OpenRCT2 git bot 26def87167 Merge Localisation/master into OpenRCT2/develop 2020-08-30 04:06:57 +00:00
OpenRCT2 git bot 76e7cd2c92 Merge Localisation/master into OpenRCT2/develop 2020-08-25 04:04:18 +00:00
OpenRCT2 git bot d5626f7f12 Merge Localisation/master into OpenRCT2/develop 2020-08-20 04:04:13 +00:00
OpenRCT2 git bot 8d141faac2 Merge Localisation/master into OpenRCT2/develop 2020-08-19 04:06:03 +00:00
OpenRCT2 git bot 40814c46d9 Merge Localisation/master into OpenRCT2/develop 2020-08-17 04:04:03 +00:00
OpenRCT2 git bot c53efa6ae4 Merge Localisation/master into OpenRCT2/develop 2020-08-16 04:03:50 +00:00
OpenRCT2 git bot d857a5e6cf Merge Localisation/master into OpenRCT2/develop 2020-08-15 21:00:46 +02:00
OpenRCT2 git bot e7eac33c82 Merge Localisation/master into OpenRCT2/develop. 2020-08-15 04:03:43 +00:00