mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,972 Commits 8 Branches 39 Tags 369 MiB
Commit Graph

22972 Commits

Author SHA1 Message Date
Margen67 2e8c16e028 Change shebang to env 
Move parameters from shebang back into set.
Add set -e to setenv and vstool for consistency.
 2022-03-16 18:21:11 -07:00
Margen67 67a70b4235 Use -n/-z in if conditions where possible 2022-03-16 18:21:11 -07:00
Margen67 c5052c05a1 Make check-code-formatting POSIX compatible 
[[ ]] double bracket conditions and $OSTYPE are both features of Bash.
 2022-03-16 18:21:11 -07:00
Margen67 e67327dbb1 ci: windows-mingw improvements 
Use cmake -B instead of mkdir for windows-mingw.
Add Windows to artifact name for consistency with other Windows jobs.
 2022-03-16 18:21:11 -07:00
Margen67 5221255802 ci: Indenting consistency 2022-03-16 18:21:11 -07:00
Margen67 abb2009af4 build-appimage-docker.sh: Replace wget with curl 
This removes an unneeded dependency.
 2022-03-16 18:21:11 -07:00
Margen67 82ee210c29 ci: Ignore files irrelevant to building 2022-03-16 18:21:11 -07:00
Margen67 05783ac8f4 ci: Use default run shell for code format check 
This is for consistency, and so shell doesn't have to be set for potential future run steps.
 2022-03-16 18:21:11 -07:00
Margen67 19c0c07db8 ci: Github > GitHub 2022-03-16 18:21:11 -07:00
Margen67 f73021a293 ci: Shorten container image to container 2022-03-16 18:21:11 -07:00
Margen67 509e669be6 ci: Update checkout+upload/download-artifact to v3 2022-03-16 18:21:11 -07:00
OpenRCT2 git bot b41c2f76cc Merge Localisation/master into OpenRCT2/develop 2022-03-16 04:09:44 +00:00
Charles Machalow bb5d53d9f2
Fix crash where peeps enter through extra ride entrances (#16727) 
Fix #16170, #16177
 2022-03-15 06:39:13 +00:00
OpenRCT2 git bot 09fc49a9d7 Merge Localisation/master into OpenRCT2/develop 2022-03-15 04:10:46 +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
Michał Janiszewski 395e769e26
Add project info to Android CMakeLists.txt 2022-03-07 18:55:16 +01:00
Michał Janiszewski 3d0db60ad9
Remove Google Analytics from Android package 2022-03-07 18:55:16 +01:00
Michael Steenbeek 11ce0e8f8a
Merge pull request #16489 from Gymnasiast/fix/16426 
Fix #16426: Empty changelog when installed to non-standard prefix
 2022-03-07 18:20:20 +01:00
Teodor Sorescu 354f8bf506
Refactor window to class: TrackDesignPlace (#16669) 
* Refactor window to class: TrackDesignPlace (#13811)

* Standardise names

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2022-03-05 15:26:25 +00:00