Merge branch 'hedge-dev:main' into main

.github/workflows/validate.yml

@@ -14,9 +14,12 @@ jobs:
   build-linux:
     name: Build Linux
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        preset: ["linux-debug", "linux-release", "linux-relwithdebinfo"]
     env:
       LLVM_VERSION: 18
-      CMAKE_PRESET: linux-release
+      CMAKE_PRESET: ${{ matrix.preset }}
 
     steps:
       - name: Checkout Repository
@@ -34,7 +37,7 @@ jobs:
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ccache-${{ runner.os }}
+          key: ccache-${{ runner.os }}-${{ matrix.preset }}
   
       - name: Cache vcpkg
         uses: actions/cache@v4
@@ -55,7 +58,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/ccache
-          key: ccache-${{ runner.os }}
+          key: ccache-${{ runner.os }}-${{ matrix.preset }}
 
       - name: Prepare Project
         run: cp ./private/* ./UnleashedRecompLib/private
@@ -73,13 +76,16 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: UnleashedRecomp-Linux
+          name: UnleashedRecomp-Linux-${{ env.CMAKE_PRESET }}
           path: ./out/build/${{ env.CMAKE_PRESET }}/UnleashedRecomp/UnleashedRecomp
   build-windows:
     name: Build Windows
     runs-on: windows-latest
+    strategy:
+      matrix:
+        preset: ["x64-Clang-Debug", "x64-Clang-Release", "x64-Clang-RelWithDebInfo"]
     env:
-      CMAKE_PRESET: x64-Clang-Release
+      CMAKE_PRESET: ${{ matrix.preset }}
 
     steps:
       - name: Checkout repository
@@ -97,7 +103,7 @@ jobs:
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ccache-${{ runner.os }}
+          key: ccache-${{ runner.os }}-${{ matrix.preset }}
 
       - name: Cache vcpkg
         uses: actions/cache@v4
@@ -144,8 +150,15 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: UnleashedRecomp-Windows
+          name: UnleashedRecomp-Windows-${{ env.CMAKE_PRESET }}
           path: .\UnleashedRecomp-Windows.zip
+
+      - name: Upload PDB
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.preset != 'x64-Clang-Release' }}
+        with:
+          name: UnleashedRecomp-Windows-${{ env.CMAKE_PRESET }}-PDB
+          path: .\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\UnleashedRecomp.pdb
   build-flatpak:
     name: Build Flatpak
     runs-on: ubuntu-24.04

README.md

@@ -182,6 +182,9 @@ Many options have been integrated to address some common quality of life improve
 - The day/night transformation cutscene in towns can use either the Xbox 360 or PlayStation 3 version, with the Xbox version artificially extending loading times for the full video play out, whilst the PlayStation version ends as soon as it's done loading.
 - Music Attenuation is a feature that was originally present in the Xbox 360 version of the game, where it'd automatically mute the background music if the console's media player was in use. This feature has been implemented using information provided by the [Windows Media Control](https://learn.microsoft.com/en-us/uwp/api/windows.media.control?view=winrt-26100) APIs in [WinRT](https://en.wikipedia.org/wiki/Windows_Runtime). Applications that interface with Windows 10/11 to display media controls are supported.
 
+> [!TIP]
+> You may refer to Music Presence's [list of supported media players](https://github.com/ungive/discord-music-presence/blob/master/documentation/supported-media-players.md) for players that work with Music Attenuation out of the box.
+
 > [!NOTE]
 > Please note that Music Attenuation is not currently available on Linux. Support for this feature may be added in a future update.
 
@@ -206,6 +209,8 @@ Modded files for the Xbox 360 version of the game are compatible with Unleashed
 
 > [!NOTE]
 > Code modding is currently not possible and is [planned for a future update](#code-modding). As a workaround for the time being, some codes have been directly embedded into the game and can be accessed through Hedge Mod Manager's Codes tab.
+>
+> For information on the mod format, check out Hedge Mod Manager's [Basic Mod File Structure](https://github.com/thesupersonic16/HedgeModManager/wiki/Basic-Mod-File-Structure) wiki page.
 
 ## Update Roadmap
 

UnleashedRecomp/gpu/video.cpp

@@ -287,8 +287,8 @@ static constexpr bool g_vulkan = true;
 
 static bool g_triangleStripWorkaround = false;
 
-static constexpr bool g_hardwareResolve = true;
-static constexpr bool g_hardwareDepthResolve = true;
+static bool g_hardwareResolve = true;
+static bool g_hardwareDepthResolve = true;
 
 static std::unique_ptr<RenderInterface> g_interface;
 static std::unique_ptr<RenderDevice> g_device;
@@ -1698,6 +1698,10 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver)
                             continue;
                         }
                     }
+
+                    // Hardware resolve seems to be completely bugged on Intel D3D12 drivers.
+                    g_hardwareResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL);
+                    g_hardwareDepthResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL);
                 }
 
                 g_vulkan = (interfaceFunction == CreateVulkanInterfaceWrapper);
@@ -2326,6 +2330,8 @@ static void DrawProfiler()
         ImGui::Text("Triangle Fan: %s", g_capabilities.triangleFan ? "Supported" : "Unsupported");
         ImGui::Text("Dynamic Depth Bias: %s", g_capabilities.dynamicDepthBias ? "Supported" : "Unsupported");
         ImGui::Text("Triangle Strip Workaround: %s", g_triangleStripWorkaround ? "Enabled" : "Disabled");
+        ImGui::Text("Hardware Resolve: %s", g_hardwareResolve ? "Enabled" : "Disabled");
+        ImGui::Text("Hardware Depth Resolve: %s", g_hardwareDepthResolve ? "Enabled" : "Disabled");
         ImGui::NewLine();
 
         ImGui::Text("API: %s", g_vulkan ? "Vulkan" : "D3D12");

UnleashedRecomp/locale/config_locale.cpp

@@ -562,9 +562,9 @@ CONFIG_DEFINE_ENUM_LOCALE(EAspectRatio)
         ELanguage::German,
         {
             { EAspectRatio::Auto, { "AUTO", "Auto: Das Seitenverhältnis passt sich automatisch der Fenstergröße an." } },
-            { EAspectRatio::Wide, { "16:9", "16:9: Stellt das Spiel in einem Breitbildschirm-Vormat dar." } },
-            { EAspectRatio::Narrow, { "4:3", "4:3: Stellt das Spiel in einem Mittel-Vormat dar." } },
-            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: Stellt das Spiel in einem Mittel-Vormat dar, was der ursprünglichen Implementation originalgetreut bleibt." } }
+            { EAspectRatio::Wide, { "16:9", "16:9: Stellt das Spiel in einem Breitbildschirm-Format dar." } },
+            { EAspectRatio::Narrow, { "4:3", "4:3: Stellt das Spiel in einem Mittel-Format dar." } },
+            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: Stellt das Spiel in einem Mittel-Format dar, was der ursprünglichen Implementation originalgetreut bleibt." } }
         }
     },
     {

docs/BUILDING.md

@@ -37,10 +37,15 @@ In the installer, you must select the following **Workloads** and **Individual c
 - C++ CMake tools for Windows
 
 ### Linux
-The following command will install the required dependencies on a distro that uses `apt` (such as Ubuntu), but you can find the equivalent packages for your preferred distro.
+The following command will install the required dependencies on a distro that uses `apt` (such as Debian-based distros).
 ```bash
 sudo apt install autoconf automake libtool pkg-config curl cmake ninja-build clang clang-tools libgtk-3-dev
 ```
+The following command will install the required dependencies on a distro that uses `pacman` (such as Arch-based distros).
+```bash
+sudo pacman -S base-devel ninja lld clang gtk3
+```
+You can also find the equivalent packages for your preferred distro.
 
 > [!NOTE]
 > This list may not be comprehensive for your particular distro and you may be required to install additional packages, should an error occur during configuration.