Merge tag 'v0.4.5' into steven-popcount

Release v0.4.5 - Feature: [OpenRCT2#18713] Block brakes have speed control and brakes slower than adjacent block brakes copy block brake speed when block brake open. - Feature: [OpenRCT2#19276] Add Powered Lifthill to Giga Coaster. - Feature: [OpenRCT2#19305] Add new Reversed Trains ride setting to run trains backwards, granting a bonus to ride ratings. - Feature: [OpenRCT2#19305] [Plugin] Add “Car.isReversed” to allow individual ride vehicles to run backwards. - Feature: [OpenRCT2#19446] Add new color options to color dropdown. - Feature: [OpenRCT2#19547] Add large sloped turns to hybrid coaster and single rail coaster. - Feature: [OpenRCT2#19930] Add plugin APIs for research. - Feature: [OpenMusic#25] Added Prehistoric ride music style. - Feature: [OpenMusic#26] Fairground Organ style 2 with new recordings from Herman's 35er Voigt (Previously known as Bressingham Voigt). - Feature: [OpenMusic#28] Add Ragtime style 2 ride music. - Improved: [OpenRCT2#17739] Raise water and land height limits to 254 units/182m/600ft. - Improved: [OpenRCT2#18490] Reduce guests walking through trains on level crossing next to station. - Improved: [OpenRCT2#18996] When marketing campaigns are disabled, disable the Marketing tab in the Finances window. - Improved: [OpenRCT2#19764] Miscellaneous scenery tab now grouped next to the all-scenery tab. - Improved: [OpenRCT2#19830] “Highlight path issues” will now hide wall elements. - Improved: [OpenRCT2#19905] Add prompt before resetting shortcut keys. - Improved: [OpenRCT2#19952] Add colour preset to Spiral Slide using the new colour options. - Improved: [OpenRCT2#19953] Add keyboard shortcut to Keyboard Shortcuts window. - Improved: [OpenRCT2#20055] Performance improvement for the software renderer. - Change: [OpenSFX#17] Update Hybrid RC lifthill loop. - Fix: [OpenRCT2#12598] Number of holes is not set correctly when saving track designs. - Fix: [OpenRCT2#13130] Android always defaulting to UK locale for language, currency and temperature. - Fix: [OpenRCT2#13397] Ride simulation causes strange station behaviour and makes the ride unusable in some cases. - Fix: [OpenRCT2#16791] Rotodrop top piece replicates when walls are placed around it and clearance checks are disabled (original bug). - Fix: [OpenRCT2#18583] Land dropdown is incorrect if there are surface entry index holes. - Fix: [OpenRCT2#18895] Responding mechanic blocked at level crossing. - Fix: [OpenRCT2#19231] Crash due to null pointer to previously deleted banner in tile copy/paste functionality. - Fix: [OpenRCT2#19296] Crash due to a race condition for parallel object loading. - Fix: [OpenRCT2#19733] Favorite ride of X guests integer overflow. - Fix: [OpenRCT2#19756] Crash with title sequences containing no commands. - Fix: [OpenRCT2#19767] No message when path is not connected to ride exit and is therefore unreachable for mechanics. - Fix: [OpenRCT2#19800] Crash when displaying station stats with more than 62 stations. - Fix: [OpenRCT2#19801] The in-game load/save window cannot be resized anymore. - Fix: [OpenRCT2#19854] Looping Coaster trains clipping through steep quarter turns down. - Fix: [OpenRCT2#19858] Issue drawing simulate flag icon on alternate colour palettes. - Fix: [OpenRCT2#19901] Random shop colours never assigning last colour. - Fix: [OpenRCT2#19911] Guests stuck at certain railway crossings. - Fix: [OpenRCT2#19924] Destructible cheat does not allow partial ride modification. - Fix: [OpenRCT2#19950] Mine train block brake supports drawn incorrectly. - Fix: [OpenRCT2#19955] Mine Train Roller Coaster has incorrect supports on the sloped left small turn (original bug). - Fix: [OpenRCT2#19987] [Plugin] ‘SetCheatAction’ has wrong ID in plugin API. - Fix: [OpenRCT2#20016] The group box for small scenery details in the Tile Inspector window has unused empty space. - Fix: [OpenRCT2#20018] Shops not calculating up-keep cost. - Fix: [OpenRCT2#20033] Asset packs cannot reference game data. - Fix: [OpenRCT2#20104] [Plugin] Some network APIs use player index and group index. - Fix: [OpenRCT2#20099] Some scrollbar is glitched or have incorrect size when open window for the first time - Fix: [OpenRCT2#20134] Grass length being updated for tiles in the void, causing unneccesary drawing operations.
foodisgoodyesiam · May 9, 2023 · 4d332c6 · 4d332c6
2 parents 16bab20 + 76ca840
commit 4d332c6
Show file tree

Hide file tree

Showing 991 changed files with 36,283 additions and 22,890 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -44,7 +44,7 @@ body:
       - This bug is specific to multiplayer
       - This bug is a graphical glitch or error
       - This issue has to do with park objects and/or asset packs
-      - Issues building the game
+      - This is a development issue
   validations:
     required: false
 

diff --git a/.github/workflows/ci.yml b/.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.4
+  OPENRCT2_VERSION: 0.4.5
 
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
 concurrency:
@@ -103,15 +103,18 @@ jobs:
       - name: Run Tests
         if: matrix.platform != 'arm64'
         run: . scripts/setenv -q && run-tests
+      - name: Test Summary
+        uses: test-summary/action@v2
+        with:
+          paths: "artifacts/test-**.xml"
+        if: matrix.platform != 'arm64'
       - name: Upload artifacts (openrct2.org)
         run: |
           . scripts/setenv
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            # Temporarily disable build uploading so they can be signed locally.
-            # See https://github.com/OpenRCT2/OpenRCT2/issues/19748
-            # upload-build artifacts/openrct2-portable-*.zip "windows-portable-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
-            # upload-build artifacts/openrct2-installer-*.exe "windows-installer-$PLATFORM.exe" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
-            # upload-build artifacts/openrct2-symbols-*.zip "windows-symbols-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-portable-*.zip "windows-portable-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-installer-*.exe "windows-installer-$PLATFORM.exe" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-symbols-*.zip "windows-symbols-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
             upload-backtrace-symbols artifacts/openrct2-symbols-*.zip
           else
               echo 'Not going to push build'
@@ -120,7 +123,7 @@ jobs:
     name: Windows (${{ matrix.platform_name }}) using mingw
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:8-mingw
+    container: openrct2/openrct2-build:11-mingw
     strategy:
       fail-fast: false
       matrix:
@@ -178,6 +181,10 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1
         with:
           key: ${{ matrix.cache_key }}
+      - name: Configure ccache
+        run: |
+          # See https://github.com/hendrikmuhs/ccache-action/issues/146
+          ccache --set-config=compiler_check=content
       - name: Install GCC problem matcher
         uses: ammaraskar/gcc-problem-matcher@master
       - name: Build OpenRCT2
@@ -187,6 +194,11 @@ jobs:
       - 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
@@ -264,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:8-focal
-            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz"
+            image: openrct2/openrct2-build:11-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:8-jammy
+            image: openrct2/openrct2-build:11-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:8-bullseye
-            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
+            image: openrct2/openrct2-build:11-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:8-focal32
+            image: openrct2/openrct2-build:11-focal32
             build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g1 -gz" -DWITH_TESTS=off
     steps:
       - name: Checkout
@@ -301,6 +313,7 @@ jobs:
           if-no-files-found: error
       - name: Run Tests
         run: . scripts/setenv -q && run-tests
+
       - name: Upload artifacts (openrct2.org)
         run: |
           # Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116
@@ -314,7 +327,7 @@ jobs:
     name: Linux (x86_64, AppImage)
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:8-focal
+    container: openrct2/openrct2-build:11-focal
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -372,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:8-jammy
+    container: openrct2/openrct2-build:11-jammy
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -384,11 +397,52 @@ jobs:
         uses: ammaraskar/gcc-problem-matcher@master
       - name: Build OpenRCT2
         run: . scripts/setenv && build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON -DDISABLE_HTTP=ON -DDISABLE_FLAC=ON -DDISABLE_VORBIS=ON -DDISABLE_OPENGL=ON
+  linux-clang-tests:
+    name: Linux (Debug) using clang, coverage enabled
+    runs-on: ubuntu-latest
+    needs: check-code-formatting
+    container: openrct2/openrct2-build:11-jammy
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: linux-clang
+      - name: Install GCC problem matcher
+        uses: ammaraskar/gcc-problem-matcher@master
+      - name: Build OpenRCT2
+        run: . scripts/setenv && build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-fprofile-instr-generate -fcoverage-mapping" -DWITH_TESTS=on
+      - name: Run Tests
+        run: . scripts/setenv -q && LLVM_PROFILE_FILE="openrct2-coverage-%p.profraw" run-tests
+      - name: Test Summary
+        uses: test-summary/action@v2
+        with:
+          paths: "artifacts/test-**.xml"
+        if: always()
+      - name: Process coverage information
+        run: |
+          cd bin
+          llvm-profdata merge -sparse openrct2-coverage*profraw -o openrct2.profdata
+          llvm-cov export -instr-profile=openrct2.profdata ./OpenRCT2Tests > coverage.json
+          llvm-cov report ./OpenRCT2Tests -instr-profile=openrct2.profdata
+          xz -1v openrct2.profdata
+          xz -1v coverage.json
+          xz -1v OpenRCT2Tests
+      - name: Upload artifacts (CI)
+        uses: actions/upload-artifact@v3
+        with:
+          name: OpenRCT2-${{ runner.os }}-coverage
+          path: |
+            bin/*profdata*
+            bin/coverage.json*
+            bin/OpenRCT2Tests.xz
+          if-no-files-found: error
   android:
     name: Android
     runs-on: ubuntu-latest
     needs: check-code-formatting
-    container: openrct2/openrct2-build:8-android
+    container: openrct2/openrct2-build:11-android
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/stale-backtrace-issues.yml b/.github/workflows/stale-backtrace-issues.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    if: github.repository == 'OpenRCT2/OpenRCT2'
     steps:
       - uses: actions/stale@v7
         with:

diff --git a/.github/workflows/stale-prs.yml b/.github/workflows/stale-prs.yml
@@ -6,13 +6,14 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    if: github.repository == 'OpenRCT2/OpenRCT2'
     steps:
       - uses: actions/stale@v7
         with:
           days-before-issue-stale: -1
           days-before-issue-close: -1
-          days-before-pr-stale: 14
+          days-before-pr-stale: 31
           days-before-pr-close: 14
           stale-pr-label: 'stale-pr'
-          stale-pr-message: 'This pull request is stale and will be closed in 14 days if no action is taken. To keep it open, leave a comment or remove the `stale-pr` label. If you''re awaiting feedback from a developer, please send us a reminder (either here or on [Discord](https://discord.gg/ZXZd8D8)).'
-          close-pr-message: 'This pull request was closed due to inactivity.'
+          stale-pr-message: 'This pull request has been marked as stale and will be closed in 14 days if no action is taken. To keep it open, leave a comment or remove the `stale-pr` label. If you''re awaiting feedback from a developer, please send us a reminder (either here or on [Discord](https://discord.gg/ZXZd8D8)).'
+          close-pr-message: 'This pull request has been closed due to inactivity. If you want to continue with this, or are awaiting a review, don''t hesitate to reach out to a developer. We''ll gladly re-open this PR! You can tag us here, or send us a message on [Discord](https://discord.gg/ZXZd8D8).'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,21 +64,21 @@ set(TITLE_SEQUENCE_VERSION "0.4.0")
 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(OBJECTS_VERSION "1.3.8")
+set(OBJECTS_VERSION "1.3.11")
 set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
-set(OBJECTS_SHA1 "2888092aab93df15bb78c4c910b13c33b1e318ef")
+set(OBJECTS_SHA1 "02ddf6c685a2da8bac98a57b34be95d63192443d")
 
-set(OPENSFX_VERSION "1.0.2")
+set(OPENSFX_VERSION "1.0.3")
 set(OPENSFX_URL  "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")
-set(OPENSFX_SHA1 "64EF7E0B7785602C91AEC66F005C035B05A2133B")
+set(OPENSFX_SHA1 "ffec5a97bd5035860c4c9a43fe32cf51886478e3")
 
-set(OPENMSX_VERSION "1.1.0")
+set(OPENMSX_VERSION "1.3.0")
 set(OPENMSX_URL  "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
-set(OPENMSX_SHA1 "8f0cf6b2fd4727e91b0d4062e7f199a43d15e777")
+set(OPENMSX_SHA1 "b0cec998a3679f1cde17d91f2508ec4923c1a25c")
 
-set(REPLAYS_VERSION "0.0.77")
+set(REPLAYS_VERSION "0.0.78")
 set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
-set(REPLAYS_SHA1 "65CA6D830789C074F575F15E3F9E2C28691C24F8")
+set(REPLAYS_SHA1 "31C5D07EED8481D5C6D57F9E4FE9443AAEDE7739")
 
 option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
 option(WITH_TESTS "Build tests")
@@ -406,7 +406,7 @@ endif ()
 # Include tests
 if (WITH_TESTS)
     enable_testing()
-    include("${ROOT_DIR}/test/tests/CMakeLists.txt" NO_POLICY_SCOPE)
+    add_subdirectory("test/tests")
 endif ()
 
 # macOS bundle "install" is handled in src/openrct2-ui/CMakeLists.txt

diff --git a/contributors.md b/contributors.md
@@ -9,14 +9,14 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Tulio Paschoalin Leao (tupaschoal)
 * Olivier Wervers (Oli414)
 * Rik Smeets (rik-smeets)
+* Matthias Moninger (ZehMatt)
 
 ## Former development team members
 * Lewis Fox (LRFLEW)
 * Marijn van der Werf (marijnvdwerf)
 * (zsilencer)
 * Richard Jenkins (rwjuk)
 * Aaron van Geffen (AaronVanGeffen)
-* Matthias Moninger (ZehMatt)
 * Michael Steenbeek (Gymnasiast)
 
 ## Long term contributors
@@ -104,6 +104,10 @@ The following people are not part of the development team, but have been contrib
 * Umar Ahmed (umar-ahmed) - MacOS file watcher
 * Andrew Arnold (fidwell) - Added window support for more scenery groups.
 * 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.
 
 ## Bug fixes
 * (KirilAngelov)
@@ -214,6 +218,8 @@ The following people are not part of the development team, but have been contrib
 * Ernest Wong (ErnWong)
 * Joel H. (HtotheTML)
 * John Mulcahy (jayjay300)
+* Chase Percy (Chase-Percy)
+* Wenzhao Qiu (qwzhaox)
 
 ## Toolchain
 * (Balletie) - macOS
@@ -270,6 +276,7 @@ The following people are not part of the development team, but have been contrib
 
 ## Music
 * Karst "Jalmaan" van Galen Last (AuraSpecs)
+* (Flyxxpy)
 
 ## RollerCoaster Tycoon 2 credits
 Design and programming by Chris Sawyer

diff --git a/data/language/ar-EG.txt b/data/language/ar-EG.txt
@@ -1221,8 +1221,8 @@ STR_1838    :الرضا: {COMMA16}%
 STR_1839    :Reliability: {COMMA16}%
 STR_1840    :Down-time: {COMMA16}%
 STR_1841    :الربح: {CURRENCY2DP} بالساعة
-STR_1842    :Favourite of: {COMMA16} guest
-STR_1843    :Favourite of: {COMMA16} guests
+STR_1842    :Favourite of: {COMMA32} guest
+STR_1843    :Favourite of: {COMMA32} guests
 STR_1844    :Select information type to show in ride/attraction list
 STR_1845    :{MONTHYEAR}
 STR_1846    :{COMMA32} guests
@@ -2193,8 +2193,8 @@ STR_3118    :{BLACK}{STRINGID} is heading for the ride
 STR_3119    :{BLACK}{STRINGID} is fixing the ride
 STR_3120    :Locate nearest available mechanic, or mechanic fixing ride
 STR_3121    :Unable to locate mechanic, or all nearby mechanics are busy
-STR_3122    :{WINDOW_COLOUR_2}Favourite ride of: {BLACK}{COMMA16} guest
-STR_3123    :{WINDOW_COLOUR_2}Favourite ride of: {BLACK}{COMMA16} guests
+STR_3122    :{WINDOW_COLOUR_2}Favourite ride of: {BLACK}{COMMA32} guest
+STR_3123    :{WINDOW_COLOUR_2}Favourite ride of: {BLACK}{COMMA32} guests
 STR_3124    :Broken {STRINGID}
 STR_3125    :{WINDOW_COLOUR_2}Excitement Factor: {BLACK}+{COMMA16}%
 STR_3126    :{WINDOW_COLOUR_2}Intensity Factor: {BLACK}+{COMMA16}%
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
     jobs:
       stale:
         runs-on: ubuntu-latest
+        if: github.repository == 'OpenRCT2/OpenRCT2'
         steps:
           - uses: actions/stale@v7
             with:
@@ Expand Down @@