1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

22976 Commits

Author SHA1 Message Date
Ted John
8aafab2a70 Split paint item into element and entity 2022-03-14 21:55:15 +00:00
Ted John
79989a5e84 Fix transparency issues 2022-03-14 21:55:15 +00:00
Ted John
ba2fea88fd Fix build failure 2022-03-14 21:55:07 +00:00
Kane
b83e21a953 Improve code readability (added parentheses) 2022-03-14 21:43:12 +00:00
Kane
20cd8465f5 Code cleanup, remove ignore_invisible_flag.
Known issues:
- Some flat-rides have transparency issues
2022-03-14 21:43:12 +00:00
Kane
ffb5affee2 Fix code formatting 2022-03-14 21:43:12 +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
26d558c4d0 Resolve merge conflict. Fix tree hiding. 2022-03-14 21:41:51 +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
9bf003c018 Add new sprites 2022-03-14 21:40:30 +00:00
Kane
564dee2671 Remove unused variables 2022-03-14 21:40:30 +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
503a351422 Start to implement ride selection list 2022-03-14 21:39:45 +00:00
Kane
1c306e0a1a Fix supports changing when trees were invisible 2022-03-14 21:38:49 +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
204f8ceac1 Add new Transparency options window.
Remove added options from Top Toolbar.
Move invisible ride code into ride paint functions.
Move invisible vehicle code into sprite paint function.
2022-03-14 21:37:41 +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
Charles Machalow
99db07cfe0 Fix #16759: No music when unmuting the game in title screen 2022-03-14 21:16:16 +01:00
Ted John
9ef7a4c13b Merge pull request #16731 from IntelOrca/plugin/patrol-areas
Implement #13620: [Plugin] Add support for patrol areas to Staff
2022-03-13 19:52:05 +00:00
Ted John
dff1d730da Implement #13620: [Plugin] Add support for patrol areas to Staff 2022-03-13 19:30:50 +00:00
Ted John
27ed19002a Merge pull request #16740 from IntelOrca/precise-patrol-areas
Allow patrol areas to be single tiles.
2022-03-13 15:20:33 +00:00
Ted John
5334b8f5c8 Do not re-create window when switching staff 2022-03-13 14:26:17 +00:00
Michael Steenbeek
37c0fffb99 Merge pull request #16777 from duncanspumpkin/paintReorg2
Apply regex on PaintAddImageAsChildRotated
2022-03-13 14:44:55 +01:00
Ted John
f8224150d5 Validate patrol area location 2022-03-12 10:43:41 +00:00
duncanspumpkin
2874b1b49d Update replays 2022-03-12 10:43:41 +00:00
Ted John
38d36acef3 Add patrol area tool window 2022-03-12 10:43:41 +00:00
duncanspumpkin
7a36e34782 Apply review comments 2022-03-12 07:26:34 +00:00
duncanspumpkin
68d0d05d49 Remove extra non rotated PaintAddImageAsChild 2022-03-11 21:45:12 +00:00
duncanspumpkin
763aae70f7 Fix regex fail 2022-03-11 21:45:12 +00:00
duncanspumpkin
39c8fda4e6 Apply regex to PaintAddImageAsChildRotated 2022-03-11 21:45:12 +00:00
Michael Steenbeek
1c781a84c8 Merge pull request #16776 from duncanspumpkin/paintReorg
Apply regex on PaintAddImageAsParentRotated2
2022-03-11 21:37:10 +01:00
Gymnasiast
dfa58470cf Apply simplification 2022-03-11 21:10:10 +01:00
Ted John
97dfe3cb73 Refactor std::lower_bound to binary_find 2022-03-11 18:39:05 +00:00
Ted John
0aa6ceb2aa Refactor similar loop in s4 and s6 import 2022-03-11 18:39:04 +00:00
Ted John
90718ca81c Refactor patrol area class to new file 2022-03-11 18:39:04 +00:00
Ted John
566bc4d311 Allow patrol areas to be single tiles
Change the patrol areas to be stored as a sorted list of points grouped in fixed cells for each staff entity. The complexity will be a mixed O(1) and O(log n) search.
2022-03-11 18:39:04 +00:00
duncanspumpkin
b7aa5ebd2e Correct failures 2022-03-11 13:55:01 +00:00
duncanspumpkin
a5a00517ea Apply regex on PaintAddImageAsParentRotated2 2022-03-11 13:45:00 +00:00
Duncan
b6175bb556 Apply regex for PaintAddIMageAsParentRotated (#16775)
* Apply regex for PaintAddIMageAsParentRotated

* Remove unused function
2022-03-11 13:36:55 +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
Silent
5e725913f8 Close #16566: Favour WinNT preprocessor version checks over MinGW (#16677) 2022-03-11 07:59:09 -03:00
Hielke Morsink
49fbc30a97 Merge pull request #16771 2022-03-11 08:55:47 +01:00
Silent
159a76d7ec Refactor uses of safe_strcat_path 2022-03-10 20:18:17 +01:00
Silent
3773fa4cb0 Refactor uses of path_append_extension 2022-03-10 20:18:17 +01:00
Michael Steenbeek
0f2cf23318 Safely look up widget for drawing 2022-03-10 01:01:59 +01:00
Michael Steenbeek
9b1c915f4d Merge pull request #16744 from Basssiiie/fix-unlimited-vehicles-defaults
Fix “Disable vehicle limits” cheat giving all new rides 32 trains with 12 cars
2022-03-09 13:03:14 +01:00
Michael Steenbeek
c69ead4ba2 Merge pull request #16763 from Gymnasiast/android-backport
Backport some parts of #16107
2022-03-08 08:54:33 +01:00
OpenRCT2 git bot
1838eaef30 Merge Localisation/master into OpenRCT2/develop 2022-03-08 04:10:51 +00:00
Ted John
b7b8816db7 Add plugin hook for map save 2022-03-07 21:40:48 +01:00