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 ffb302a6cf Merge Localisation/master into OpenRCT2/develop 2022-04-14 04:01:48 +00:00
OpenRCT2 git bot 18882d1ba4 Merge Localisation/master into OpenRCT2/develop 2022-04-12 04:01:51 +00:00
Michael Steenbeek b35b1e2ec9
Grammar fix in STR_6488 
[ci skip]
 2022-04-10 00:49:40 +02:00
Hielke Morsink c429fc329a
Add a new warning for queue length complaints 2022-04-05 19:55:48 +02:00
Hielke Morsink b66d15659f
Remove the new cheat that disable queue length limits 
This partially reverts commit 0ece5d0f44.
 2022-04-05 19:55:44 +02:00
Charles Machalow 0ece5d0f44
Add a new cheat to disable queue length limits 2022-04-02 20:07:06 +02:00
OpenRCT2 git bot 01fa29bb6f Merge Localisation/master into OpenRCT2/develop 2022-03-30 04:09:57 +00:00
OpenRCT2 git bot b90814369d Merge Localisation/master into OpenRCT2/develop 2022-03-22 04:01:54 +00:00
Ted John f909be7a43
Merge pull request #16797 from IntelOrca/feature/enhanced-transparency 
Introduce more transparency toggles and allow each one to be set to either an invisible or ghost state which is a persisted user setting.

A new window is introduced to control these settings and is inspired by OpenTTD.
 2022-03-20 17:56:08 +00:00
OpenRCT2 git bot f9c0cb1cd2 Merge Localisation/master into OpenRCT2/develop 2022-03-19 04:01:55 +00:00
Ted John 884ef6b8ac Change transparent trees to all vegetation 2022-03-19 00:07:06 +00:00
OpenRCT2 git bot b41c2f76cc Merge Localisation/master into OpenRCT2/develop 2022-03-16 04:09:44 +00:00
OpenRCT2 git bot 09fc49a9d7 Merge Localisation/master into OpenRCT2/develop 2022-03-15 04:10:46 +00:00
Ted John 52e5d48501 Update shortcuts and toolbar menu 2022-03-14 21:57:05 +00:00
Kane 5d7f7485aa Update for rebase, add window theme, fix bugs 
- Along with rebasing the code it became nessecary to update various
  calls to `scenery_small_entry_has_flag` and `EntityBase`.

- Added a new window theme with default colours.

- Fixed bug with see-through supports not working.

- Removed incomplete "ride exclusions" tab

- Removed unused text string (Ride Exclusions)
 2022-03-14 21:43:09 +00:00
Kane 3d3271a5ec Misc. clean ups 
Define see-through paint colours in Paint.h for global use
Color staff sprite button
Change ride->is_visible bool to ignore_invisible_flag bool
Add shortcut to open transparency options (CTRL+T)
 2022-03-14 21:41:49 +00:00
Kane 2e93e42a71 More finishing touches 
- Changes all references of `VIEWPORT_FLAG_INVISIBLE_PEEPS` to `VIEWPORT_FLAG_INVISIBLE_GUESTS` and `VIEWPORT_FLAG_INVISIBLE_STAFF`
- Updates Invisible People menu item and shortcut.
- Added new viewport flags into the `viewport_set_visibility` function
- Invisible options only work if see-through is activated as well
- Added see-through supports

- Regression: Exclude ride from invisible no longer works (ride is still see-through)
 2022-03-14 21:40:27 +00:00
Kane e134be9538 Implement more options 
- Invisible guests
- Invisible staff
- See-through trees
- Invisible trees
- Strings/Ids
 2022-03-14 21:38:46 +00:00
Kane 4856c3adaf Implement invisible rides, paths & scenery 2022-03-14 21:37:18 +00:00
Kane 9f78c6f0ce Add option to see-through vehicles 2022-03-14 21:36:47 +00:00
Ted John 38d36acef3 Add patrol area tool window 2022-03-12 10:43:41 +00:00
Ivan Krushkov eb423a73b7
Close #12793: Excitement/Intensity/Nausea ratings to Ride List view with sorting (#16655) 2022-03-11 11:17:14 +00:00
OpenRCT2 git bot 1838eaef30 Merge Localisation/master into OpenRCT2/develop 2022-03-08 04:10:51 +00:00
OpenRCT2 git bot d87089259e Merge Localisation/master into OpenRCT2/develop 2022-02-22 04:09:36 +00:00
OpenRCT2 git bot 88528c76c6 Merge Localisation/master into OpenRCT2/develop 2022-02-20 04:09:25 +00:00
OpenRCT2 git bot 7ead70968b Merge Localisation/master into OpenRCT2/develop 2022-02-19 04:09:15 +00:00
Gymnasiast b424682934
Refine STR_6371 
[ci skip]
 2022-02-18 21:56:00 +01:00
Gymnasiast 8fa150a3d7
Fix error in STR_6371 2022-02-18 18:04:23 +01:00
OpenRCT2 git bot 9322f415a9 Merge Localisation/master into OpenRCT2/develop 2022-02-16 04:09:00 +00:00
Ted John 454bfb0a8f Refactor map size to allow for rectangle maps 2022-02-14 23:15:59 +00:00
skdltmxn 9cd502a9f7 Fix staff statistics overflow 2022-02-14 07:42:18 +00:00
OpenRCT2 git bot b939bc2ac4 Merge Localisation/master into OpenRCT2/develop 2022-02-07 04:09:06 +00:00
OpenRCT2 git bot df77222390 Merge Localisation/master into OpenRCT2/develop 2022-01-29 04:08:33 +00:00
OpenRCT2 git bot 79eca16ad4 Merge Localisation/master into OpenRCT2/develop 2022-01-26 04:09:02 +00:00
Michael Steenbeek 28b10f6787
Merge pull request #16498 from Gymnasiast/remove/scaling-dropdown 
Always use SNN for non-integer scaling
 2022-01-25 10:55:17 +01:00
OpenRCT2 git bot 9a37b31306 Merge Localisation/master into OpenRCT2/develop 2022-01-25 04:08:57 +00:00
Gymnasiast 98cd39a375
Always use SNN for non-integer scaling 2022-01-24 17:46:22 +01:00
OpenRCT2 git bot 131763143d Merge Localisation/master into OpenRCT2/develop 2022-01-22 04:08:35 +00:00
OpenRCT2 git bot e503603018 Merge Localisation/master into OpenRCT2/develop 2022-01-21 04:09:04 +00:00
OpenRCT2 git bot 5badf735e5 Merge Localisation/master into OpenRCT2/develop 2022-01-20 04:08:43 +00:00
OpenRCT2 git bot 8e8f2be93f Merge Localisation/master into OpenRCT2/develop 2022-01-19 04:08:47 +00:00
OpenRCT2 git bot e78704f48f Merge Localisation/master into OpenRCT2/develop 2022-01-18 04:10:04 +00:00
Gymnasiast b0df7d9334
Fix TI visibility column text 2022-01-17 14:55:24 +01:00
OpenRCT2 git bot c8f037ba7d Merge Localisation/master into OpenRCT2/develop 2022-01-09 04:09:35 +00:00
OpenRCT2 git bot e4af63d3f6 Merge Localisation/master into OpenRCT2/develop 2021-12-11 04:09:03 +00:00
OpenRCT2 git bot 0879f96f96 Merge Localisation/master into OpenRCT2/develop 2021-12-10 04:09:11 +00:00
OpenRCT2 git bot a396289a7a Merge Localisation/master into OpenRCT2/develop 2021-12-09 04:09:15 +00:00
OpenRCT2 git bot bb35adc5b8 Merge Localisation/master into OpenRCT2/develop 2021-12-08 04:09:19 +00:00
OpenRCT2 git bot 8d48a82796 Merge Localisation/master into OpenRCT2/develop 2021-12-01 04:11:00 +00:00
OpenRCT2 git bot c58f96c029 Merge Localisation/master into OpenRCT2/develop 2021-11-30 04:07:43 +00:00
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