mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity
22,991 Commits 8 Branches 59 Tags
7ee515bd41cac7c623d32ab2eb2431bd046dc8d5
Commit Graph

22991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gymnasiast
7ee515bd41 Revert to older SDK 2022-03-18 22:01:24 +01:00
Gymnasiast
93cce0bbc4 Re-add armeabi-v7a 2022-03-18 22:01:24 +01:00
Michał Janiszewski
a80025f87d Only assemble release for Android in CI 2022-03-18 22:01:24 +01:00
Michał Janiszewski
dccc610f17 Upload new build artifact for Android 2022-03-18 22:01:24 +01:00
Michał Janiszewski
b89ad36c94 Change Gradle target used in CI 2022-03-18 22:01:24 +01:00
Michał Janiszewski
abc2f5bbf6 Update to Gradle 7.3.2 2022-03-18 22:01:24 +01:00
Michał Janiszewski
0e1e9c1dde Use updated Android image in CI 2022-03-18 22:01:23 +01:00
Michał Janiszewski
d7e3b6ab28 Update Android configuration 2022-03-18 22:00:37 +01:00
Joel Larson
662c74228a Fix #13629: Refactor RCT1_PEEP_SPRITE_TYPE to use scoped enum (#13863) 
Co-authored-by: Joel Larson <isochronlabs@protonmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2022-03-18 07:51:39 -03:00
Duncan
d266743083 Fix #16808: Incorrect serialisation of track design object (#16817) 2022-03-18 07:10:19 -03:00
Margen67
09b9bd90d4 Fix #2987, #7417: Use game actions for most set commands (#15032) 
Fix #2987
Fix #7417
 2022-03-18 07:06:27 -03:00
Tulio Leao
5408d053ff Merge pull request #16015 from duncanspumpkin/clang-tidy4 2022-03-18 01:01:45 -03:00
Tulio Leao
397bc51e68 Rename _sdlfsFlags to _sdlFullscreenFlags 2022-03-18 00:38:26 -03:00
duncanspumpkin
f835a5b521 Apply clang-tidy to static variables 2022-03-18 00:38:26 -03:00
Tulio Leao
93d13552a9 Merge pull request #16770 from Margen67/scripts_part1 2022-03-17 23:42:53 -03:00
Michael Steenbeek
2cd075f6e7 Merge pull request #16805 from CookiePLMonster/cmdline-sprite-fix 
Refactor path_end_with_separator and filename_valid_characters
 2022-03-17 22:06:36 +01:00
Margen67
7d1b6b3d9a Shorten substring expansion 2022-03-16 18:21:11 -07:00
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
Silent
771637f24c Refactor filename_valid_characters into Platform::IsFilenameValid 2022-03-16 21:56:54 +01:00
Silent
28b0a39a73 Refactor CmdlineSprite.cpp and remove path_end_with_separator 2022-03-16 21:56:54 +01: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