Merge remote-tracking branch 'upstream/develop' into unity3d

.github/workflows/backtrace-commit-fix.yml

@@ -17,7 +17,7 @@ jobs:
           BODY: ${{ github.event.issue.body }}
         id: fix
         run: |
-          changed_body=$(echo "$BODY" | sed '/<strong>commit<\/strong>/,/<\/li>/ s/<code>\([0-9a-f]\{7,\}\)<\/code>/\1/')
+          changed_body=$(echo "$BODY" | sed '/<strong>commit<\/strong>/,/<\/ul>/ s/<code>\([0-9a-f]\{7,\}\)<\/code>/\1/g')
           if [[ "$changed_body" == "$BODY" ]]; then
             echo "Unable to match the Backtrace report format."
             exit 1

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ env:
   OPENRCT2_BUILD_SERVER: GitHub
   OPENRCT2_ORG_TOKEN: ${{ secrets.OPENRCT2_ORG_TOKEN }}
   BACKTRACE_IO_TOKEN: ${{ secrets.BACKTRACE_IO_TOKEN }}
-  OPENRCT2_VERSION: 0.4.5
+  OPENRCT2_VERSION: 0.4.6
 
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
 concurrency:
@@ -123,7 +123,7 @@ jobs:
     name: Windows (${{ matrix.platform_name }}) using mingw
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:11-mingw
+    container: openrct2/openrct2-build:12-mingw
     strategy:
       fail-fast: false
       matrix:
@@ -191,14 +191,6 @@ jobs:
         run: |
           HOMEBREW_NO_ANALYTICS=1 brew install ninja pkg-config
           . scripts/setenv -q && build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=on ${{ matrix.build_flags }}
-      - name: Run Tests
-        if: ${{matrix.run_tests}}
-        run: . scripts/setenv -q && run-tests
-      - name: Test Summary
-        uses: test-summary/action@v2
-        with:
-          paths: "artifacts/test-**.xml"
-        if: ${{matrix.run_tests}}
       - name: Build artifacts
         run: |
           . scripts/setenv
@@ -213,6 +205,14 @@ jobs:
           name: OpenRCT2-${{ runner.os }}-${{ matrix.arch }}-cmake
           path: artifacts/openrct2-macos.zip
           if-no-files-found: error
+      - name: Run Tests
+        if: ${{matrix.run_tests}}
+        run: . scripts/setenv -q && run-tests
+      - name: Test Summary
+        uses: test-summary/action@v2
+        with:
+          paths: "artifacts/test-**.xml"
+        if: ${{matrix.run_tests}}
   macos-universal:
     name: macOS universal app bundle
     runs-on: macos-latest
@@ -276,19 +276,19 @@ jobs:
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off -DDISABLE_FLAC=ON -DDISABLE_VORBIS=ON
           - platform: x86_64
             distro: focal
-            image: openrct2/openrct2-build:11-focal
+            image: openrct2/openrct2-build:12-focal
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off
           - platform: x86_64
             distro: jammy
-            image: openrct2/openrct2-build:11-jammy
+            image: openrct2/openrct2-build:12-jammy
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
           - platform: x86_64
             distro: bullseye
-            image: openrct2/openrct2-build:11-bullseye
+            image: openrct2/openrct2-build:12-bullseye
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
           - platform: i686
             distro: focal
-            image: openrct2/openrct2-build:11-focal32
+            image: openrct2/openrct2-build:12-focal32
             build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g1 -gz" -DWITH_TESTS=off
     steps:
       - name: Checkout
@@ -327,7 +327,7 @@ jobs:
     name: Linux (x86_64, AppImage)
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:11-focal
+    container: openrct2/openrct2-build:12-focal
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -385,7 +385,7 @@ jobs:
     name: Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:11-jammy
+    container: openrct2/openrct2-build:12-jammy
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -401,7 +401,7 @@ jobs:
     name: Linux (Debug) using clang, coverage enabled
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:11-jammy
+    container: openrct2/openrct2-build:12-jammy
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -442,7 +442,7 @@ jobs:
     name: Android
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:11-android
+    container: openrct2/openrct2-build:12-android
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/stale-backtrace-issues.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'OpenRCT2/OpenRCT2'
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           days-before-issue-stale: 60
           days-before-issue-close: 1

.github/workflows/stale-prs.yml

@@ -8,8 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'OpenRCT2/OpenRCT2'
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
+          exempt-all-pr-assignees: true
+          exempt-all-pr-milestones: true
+          exempt-draft-pr: true
           days-before-issue-stale: -1
           days-before-issue-close: -1
           days-before-pr-stale: 31

.gitignore

@@ -304,7 +304,7 @@ discord-rpc
 #########################
 .vscode/*
 .vscode/settings.json
-!.vscode/tasks.json
+.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 

CMakeLists.txt

@@ -60,9 +60,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
-set(TITLE_SEQUENCE_VERSION "0.4.0")
+set(TITLE_SEQUENCE_VERSION "0.4.6")
 set(TITLE_SEQUENCE_URL  "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip")
-set(TITLE_SEQUENCE_SHA1 "4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0")
+set(TITLE_SEQUENCE_SHA1 "80fefc6ebbabc42a6f4703412daa5c62f661420d")
 
 set(OBJECTS_VERSION "1.3.11")
 set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
@@ -72,9 +72,9 @@ set(OPENSFX_VERSION "1.0.3")
 set(OPENSFX_URL  "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")
 set(OPENSFX_SHA1 "ffec5a97bd5035860c4c9a43fe32cf51886478e3")
 
-set(OPENMSX_VERSION "1.3.0")
+set(OPENMSX_VERSION "1.5")
 set(OPENMSX_URL  "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
-set(OPENMSX_SHA1 "b0cec998a3679f1cde17d91f2508ec4923c1a25c")
+set(OPENMSX_SHA1 "f3c707e576281758637598ce68880416891fe5f9")
 
 set(REPLAYS_VERSION "0.0.78")
 set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
@@ -86,8 +86,8 @@ option(PORTABLE "Create a portable build (-rpath=$ORIGIN)" OFF)
 option(APPIMAGE "Create an appimage build (-rpath=$ORIGIN/../lib)" OFF)
 option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
 option(DOWNLOAD_OBJECTS "Download objects during installation." ON)
-option(DOWNLOAD_OPENSFX "Download OpenSoundEffects during installation." OFF)
-option(DOWNLOAD_OPENMSX "Download OpenMusic during installation." OFF)
+option(DOWNLOAD_OPENSFX "Download OpenSoundEffects during installation." ON)
+option(DOWNLOAD_OPENMSX "Download OpenMusic during installation." ON)
 CMAKE_DEPENDENT_OPTION(DOWNLOAD_REPLAYS "Download replays during installation." ON
     "WITH_TESTS" OFF)
 CMAKE_DEPENDENT_OPTION(MACOS_USE_DEPENDENCIES "Use OpenRCT2 dependencies instead of system libraries" ON
@@ -100,7 +100,8 @@ option(STATIC "Create a static build.")
 option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.")
 
 option(DISABLE_DISCORD_RPC "Disable Discord-RPC support." OFF)
-option(DISABLE_GOOGLE_BENCHMARK "Disable Google Benchmarks support." OFF)
+# Currently unused, disable by default.
+option(DISABLE_GOOGLE_BENCHMARK "Disable Google Benchmarks support." ON)
 option(DISABLE_HTTP "Disable HTTP support.")
 option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
 option(DISABLE_TTF "Disable support for TTF provided by freetype2.")
@@ -160,12 +161,6 @@ if (MACOS_USE_DEPENDENCIES)
     endif ()
 endif ()
 
-# If OS is Linux, import OpenSoundEffects and OpenMusic
-if(UNIX AND NOT APPLE)
-    set(DOWNLOAD_OPENMSX ON)
-    set(DOWNLOAD_OPENSFX ON)
-endif()
-
 # LIST of supported flags, use SET_CHECK_CXX_FLAGS() to apply to target.
 # Use ADD_CHECK_CXX_COMPILER_FLAG() to add to list.
 set(SUPPORTED_CHECK_CXX_COMPILER_FLAGS "")

cmake/download.cmake

@@ -29,7 +29,7 @@ function(download_openrct2_zip)
     endforeach(check_exist_file_or_dir)
 
     if (DOWNLOAD_ZIP)
-        message("Downloading ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}")
+        message("Downloading ${DOWNLOAD_OPENRCT2_ZIP_URL} to ${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}")
         file(DOWNLOAD
             "${DOWNLOAD_OPENRCT2_ZIP_URL}" "${DOWNLOAD_OPENRCT2_DOWNLOAD_DIR}/${ZIP_FILE_NAME}"
             EXPECTED_HASH SHA1=${DOWNLOAD_OPENRCT2_SHA1} SHOW_PROGRESS)

contributors.md

@@ -8,7 +8,6 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Hielke Morsink (Broxzier)
 * Tulio Paschoalin Leao (tupaschoal)
 * Olivier Wervers (Oli414)
-* Rik Smeets (rik-smeets)
 * Matthias Moninger (ZehMatt)
 
 ## Former development team members
@@ -18,6 +17,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Richard Jenkins (rwjuk)
 * Aaron van Geffen (AaronVanGeffen)
 * Michael Steenbeek (Gymnasiast)
+* Rik Smeets (rik-smeets)
 
 ## Long term contributors
 The following people are not part of the development team, but have been contributing for a long time.
@@ -102,12 +102,14 @@ The following people are not part of the development team, but have been contrib
 * Karst van Galen Last (AuraSpecs) - Ride paint (bounding boxes, extra track pieces), soundtrack, sound effects, misc.
 * (8street) - Misc.
 * Umar Ahmed (umar-ahmed) - MacOS file watcher
-* Andrew Arnold (fidwell) - Added window support for more scenery groups.
+* Andrew Arnold (fidwell) - Misc.
 * Josh Trzebiatowski (trzejos) - Ride and scenery filtering
 * (kyphii) - Extended color selection, reversed ride vehicles, misc.
 * Phumdol Lookthipnapha (beam41) - Misc.
 * Nikolas Parshook (nparshook) - Misc.
 * Wenzhao Qiu (qwzhaox) - Misc.
+* Tiago Reul (reul) - Misc.
+* Fredrik Tegnell (fredriktegnell) - Misc.
 
 ## Bug fixes
 * (KirilAngelov)
@@ -213,13 +215,15 @@ The following people are not part of the development team, but have been contrib
 * Conrad Cash (HouseholdVTuber)
 * Michael Bickerton (mdbckrtn)
 * Nehemiah Negussie (nehemiah-negussie)
-* (zzril)
+* Severin Paul Höfer (zzril)
 * Ernest Elgin (eaeiv)
 * Ernest Wong (ErnWong)
 * Joel H. (HtotheTML)
 * John Mulcahy (jayjay300)
 * Chase Percy (Chase-Percy)
 * Wenzhao Qiu (qwzhaox)
+* Michael Bernardi (mrmbernardi)
+* Aram Kazorian (aramk-hub)
 
 ## Toolchain
 * (Balletie) - macOS
@@ -259,7 +263,7 @@ The following people are not part of the development team, but have been contrib
 * Esperanto - (tellovishous), Raymond Zhao (rzhao271)
 * Finnish - (DJHasis), (Zode), (TheWing)
 * French - (fbourigault), Joël Troch (JoelTroch), Michael Steenbeek (Gymnasiast), Romain Vigier (rmnvgr), (AziasYur), Hugo Courtial (s0r00t), David Delobel (incyclum), Nicolas Hawrysh (xp4xbox)
-* German - (danidoedel), (atmaxinger), (Yepoleb), Daniel Kessel (dkessel), Leon (AllGoodNamesAreTaken), (raidcookie)
+* German - (danidoedel), (atmaxinger), (Yepoleb), Daniel Kessel (dkessel), Leon (AllGoodNamesAreTaken), (raidcookie), Gilian Rehm (gr33ndev)
 * Italian - Luca Andrea Rossi (LucaRed), Precious Ugo Abara (48cfu)
 * Japanese - Aaron van Geffen (AaronVanGeffen), Haruna Chinzei, Nick Hall (nickhall), (jhako), Harry Lam (daihakken)
 * Korean - Willem J. Lee (telk5093), (NeverDruid); small fixes: (kexplo)
@@ -275,8 +279,17 @@ The following people are not part of the development team, but have been contrib
 * Booster Sprites - Nicolas Hawrysh (xp4xbox)
 
 ## Music
+* Allister Brimble
+* Herman Riddering
 * Karst "Jalmaan" van Galen Last (AuraSpecs)
 * (Flyxxpy)
+* Jan Büchner (Greyfade)
+* (Skyshard)
+* (Blackend Blue)
+
+## Sound Effects
+* Karst van Galen Last (AuraSpecs)
+* (ThatGuyYouKnow)
 
 ## RollerCoaster Tycoon 2 credits
 Design and programming by Chris Sawyer

data/language/ca-ES.txt

@@ -3692,6 +3692,13 @@ STR_6582    :Obre la finestra de dreceres de teclat
 STR_6583    :{WINDOW_COLOUR_2}Inverteix el sentit
 STR_6584    :Trieu-ho per a invertir el sentit de moviment dels cotxes
 STR_6585    :Els canvis no es poden fer…
+STR_6586    :OpenRCT2
+STR_6587    :El tema principal de l’OpenRCT2 és obra de l’Allister Brimble,{NEWLINE}amb llicència CC BY-SA 4.0.
+STR_6588    :Gràcies al Herman Riddering per permetre’ns gravar el 35er Voigt.
+STR_6589    :Mostra els botons de les finestres a l’esquerra
+STR_6590    :Mostra els botons de les finestres (com ara el de tancar la finestra) a l’esquerra en lloc de mostrar-los a la dreta.
+STR_6591    :L’empleat ara mateix arregla una atracció i no se’l pot acomiadar.
+STR_6592    :L’empleat ara mateix fa una inspecció i no se’l pot acomidiar.
 
 #############
 # Scenarios #

data/language/da-DK.txt

@@ -2990,7 +2990,7 @@ STR_5832    :Vis højde som generiske enheder i stedet for måleformat, der er u
 STR_5833    :Ændrer det datoformat, der bruges
 STR_5834    :Vælg, hvilken lydenhed OpenRCT2 skal bruge
 STR_5835    :Slå lyden fra for spillet, hvis vinduet mister fokus
-STR_5836    :Vælg musik, der skal bruges i hovedmenuen. {NEWLINE} Hvis du vælger RCT1-tema, kræver det, at du kopierer ‘data/css17.dat’ fra din RCT1-spilmappe til ‘data/css50.dat’ i din RCT2-mappe eller angiver stien til RCT1 under fanen Diverse.
+STR_5836    :Vælg musik, der skal bruges i hovedmenuen. {NEWLINE} Hvis du vælger RCT1-tema, kræver det, at du angiver stien til RCT1 under fanen Avanceret.
 STR_5837    :Oprette og administrere brugerdefinerede brugergrænsefladetemaer
 STR_5838    :Vis en separat knap til finansvinduet på værktøjslinjen
 STR_5839    :Vis en separat knap til forsknings- og udviklingsvinduet på værktøjslinjen
@@ -3590,9 +3590,9 @@ STR_6487    :Skift gennemsigtig personale
 STR_6488    :{RED}Gæster klager over længden af køerne i din park.{NEWLINE}Overvej at forkorte problematiske køer eller øge forlystelsernes gennemstrømning.
 STR_6489    :Fejl: Inkompatibel Park Version
 STR_6490    :Advarsel: Semi-kompatibel Park Version
-STR_6491    :Denne park blev gemt i en nyere version af OpenRCT2. Parken er v{INT32} og kræver mindst v{INT32}.
+STR_6491    :Denne park blev gemt i en nyere version af OpenRCT2. Parken er v{INT32} og kræver mindst v{INT32}. Du benytter v{INT32}
 STR_6492    :Denne park er gemt i en ældre version af OpenRCT2, og kan ikke åbnes med denne version af OpenRCT2. Parken er v{INT32}.
-STR_6493    :Denne park blev gemt i en nyere version af OpenRCT2, nogle data kan gå tabt. Parken er v{INT32} og kræver mindst v{INT32}.
+STR_6493    :Denne park blev gemt i en nyere version af OpenRCT2, nogle data kan gå tabt. Parken er gemt i v{INT32}. Du benytter v{INT32}
 STR_6497    :Klik på et felt for at vise dets felt elementer.{NEWLINE}Ctrl + Klik et felt element for at vælge det direkte.
 STR_6498    :Aktiver for at fastholde kvadratisk kortfacon.
 STR_6499    :Køretøjstype understøttes ikke af spor design formatet
@@ -3611,9 +3611,9 @@ STR_6511    :Nul G Rul (højre)
 STR_6512    :Stor nul G Rul (venstre)
 STR_6513    :Stor nul G Rul (højre)
 STR_6514    :Ugyldig højde!
-STR_6515    :{BLACK}RCT1 er ikke linket - Reserve billeder vil blive brugt.
-STR_6516    :Et eller flere objekter tilføjet kræver at RCT1 er linket for ordenlig visning. Reserve billeder vil blive brugt.
-STR_6517    :Et eller flere objekter i denne park kræver at RCT1 er linket for ordenlig visning. Reserve billeder vil blive brugt.
+STR_6515    :{BLACK}RollerCoaster Tycoon 1 er ikke linket - Reserve billeder vil blive brugt.
+STR_6516    :Et eller flere objekter tilføjet kræver at RollerCoaster Tycoon 1 er linket for ordenlig visning. Reserve billeder vil blive brugt.
+STR_6517    :Et eller flere objekter i denne park kræver at RollerCoaster Tycoon 1 er linket for ordenlig visning. Reserve billeder vil blive brugt.
 STR_6518    :{BLACK}Hold over et scenarie for at se beskrivelse og mål. Klik for at starte med at spille.
 STR_6519    :Ekstra
 STR_6520    :Materiel pakker
@@ -3632,6 +3632,7 @@ STR_6532    :Katy’s Dreamworld
 STR_6533    :{WINDOW_COLOUR_2}Spændings Faktor: {BLACK}-{COMMA16}%
 STR_6534    :{WINDOW_COLOUR_2}Intensitets Faktor: {BLACK}-{COMMA16}%
 STR_6535    :{WINDOW_COLOUR_2}Kvalme Faktor: {BLACK}-{COMMA16}%
+STR_6536    :Denne park var gemt i en senere version af OpenRCT2. Parken var gemt i v{INT32}, du benytter v{INT32}.
 
 #############
 # Scenarios #

data/language/de-DE.txt

@@ -3684,6 +3684,13 @@ STR_6582    :Tastenkürzelfenster öffnen
 STR_6583    :{WINDOW_COLOUR_2}Umgekehrte Züge
 STR_6584    :Auswählen, um Züge rückwärts fahren zu lassen
 STR_6585    :Änderungen können nicht ausgeführt werden …
+STR_6586    :OpenRCT2
+STR_6587    :Das OpenRCT2-Titelthema ist ein Werk von Allister Brimble, {NEWLINE}lizenziert unter CC BY-SA 4.0.
+STR_6588    :Vielen Dank an Herman Riddering für die Erlaubnis, den 35er Voigt aufzunehmen.
+STR_6589    :Schaltflächen auf der linken Seite anzeigen
+STR_6590    :Schaltflächen (z.B. zum Schließen des Fensters) auf der linken anstatt auf der rechten Seite der Titelleiste anzeigen.
+STR_6591    :Der Mitarbeiter repariert gerade ein Fahrgeschäft und kann deshalb nicht entlassen werden.
+STR_6592    :Der Mitarbeiter inspiziert gerade ein Fahrgeschäft und kann deshalb nicht entlassen werden.
 
 #############
 # Scenarios #