Merge branch 'hedge-dev:main' into ControllerHotplugImprovements

Author: AL2009man

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,95 @@
+name: Bug Report
+description: Report a bug, crash, or other type of error in Unleashed Recompiled
+type: Bug
+body:
+  - id: validation
+    type: checkboxes
+    attributes:
+      label: Validation
+      options:
+      - label: I have checked the [Issues](https://github.com/hedge-dev/UnleashedRecomp/issues) page to see if my problem has already been reported
+        required: true
+      - label: I have confirmed that this bug does not occur in the original game running on original Xbox 360 hardware
+        required: false
+  - id: dlc-installed
+    type: checkboxes
+    attributes:
+      label: If you have DLC installed, please specify which ones you have.
+      options:
+      - label: Apotos & Shamar Adventure Pack
+        required: false
+      - label: Chun-nan Adventure Pack
+        required: false
+      - label: Empire City & Adabat Adventure Pack
+        required: false
+      - label: Holoska Adventure Pack
+        required: false
+      - label: Mazuri Adventure Pack
+        required: false
+      - label: Spagonia Adventure Pack
+        required: false
+  - id: mods-used
+    type: textarea
+    validations:
+      required: false
+    attributes:
+      label: If you have mods enabled, please specify which ones you have.
+      description: Provide a list of your enabled mods in Hedge Mod Manager here. You will not receive support for issues *caused* by mods.
+  - id: codes-used
+    type: textarea
+    validations:
+      required: false
+    attributes:
+      label: If you have codes enabled, please specify which ones you have.
+      description: Provide a list of your enabled codes in Hedge Mod Manager here.
+  - id: describe-bug
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of what the bug is.
+  - id: repro-steps
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to Reproduce
+      description: Step-by-step instructions on how to reproduce the bug.
+      placeholder: |
+        1. Go to '...'
+        2. etc.
+  - id: expected-behavior
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+  - id: footage
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Footage
+      description: Attach a screenshot or video of the bug. If possible, please also provide footage of the expected behaviour on original Xbox 360 hardware.
+  - id: system-specifications
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: System Specifications
+      description: Fill out the following details.
+      placeholder: |
+       - CPU: (e.g. Intel Core [...], AMD Ryzen [...], etc.)
+       - GPU: (e.g. NVIDIA GeForce [...], Radeon HD [...], Intel HD [...], etc.)
+       - GPU Driver: (e.g NVIDIA driver 545.XX, AMD driver 24.X.X, etc.)
+       - OS: (e.g. Windows 10, Windows 11, Linux distro)
+       - Version: (e.g. 1.0.0)
+  - id: additional-context
+    type: textarea
+    validations:
+      required: false
+    attributes:
+      label: Additional Context
+      description: Provide any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/config.yml

@@ -397,3 +397,13 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+
+# IntelliJ IDEs
+.idea/
+
+# macOS metadata
+*.DS_Store
+
+# CMake Files
+**/cmake-build-debug
+**/CMakeCache.txt

.gitignore

@@ -58,3 +58,6 @@
 [submodule "thirdparty/json"]
 	path = thirdparty/json
 	url = https://github.com/nlohmann/json
+[submodule "UnleashedRecomp/api"]
+	path = UnleashedRecomp/api
+	url = https://github.com/hedge-dev/SWA.git

.gitmodules

@@ -183,6 +183,8 @@ set(UNLEASHED_RECOMP_USER_CXX_SOURCES
     "user/config.cpp"
     "user/registry.cpp"
     "user/paths.cpp"
+    "user/persistent_data.cpp"
+    "user/persistent_storage_manager.cpp"
 )
 
 set(UNLEASHED_RECOMP_MOD_CXX_SOURCES
@@ -229,7 +231,8 @@ set(UNLEASHED_RECOMP_CXX_SOURCES
     "app.cpp"
     "exports.cpp"
     "main.cpp"
-    "misc_impl.cpp"
+    "misc_impl.cpp"
+    "preload_executable.cpp"
     "sdl_listener.cpp"
     "stdafx.cpp"
     "version.cpp"
@@ -310,7 +313,11 @@ endif()
 if (UNLEASHED_RECOMP_D3D12)
     find_package(directx-headers CONFIG REQUIRED)
     find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_D3D12)
+    target_compile_definitions(UnleashedRecomp PRIVATE 
+        UNLEASHED_RECOMP_D3D12
+        D3D12MA_USING_DIRECTX_HEADERS
+        D3D12MA_OPTIONS16_SUPPORTED
+    )
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -434,35 +441,6 @@ compile_pixel_shader(resolve_msaa_depth_2x)
 compile_pixel_shader(resolve_msaa_depth_4x)
 compile_pixel_shader(resolve_msaa_depth_8x)
 
-function(generate_aggregate_header INPUT_DIRECTORY OUTPUT_FILE)
-    get_filename_component(ABS_OUTPUT_FILE "${OUTPUT_FILE}" ABSOLUTE)
-    file(GLOB_RECURSE HEADER_FILES "${INPUT_DIRECTORY}/*.h")
-    set(HEADER_CONTENT "#pragma once\n\n")
-
-    foreach(HEADER_FILE IN LISTS HEADER_FILES)
-        get_filename_component(ABS_HEADER_FILE "${HEADER_FILE}" ABSOLUTE)
-        if (ABS_HEADER_FILE STREQUAL ABS_OUTPUT_FILE)
-            continue()
-        endif()
-        file(RELATIVE_PATH RELATIVE_HEADER_FILE "${INPUT_DIRECTORY}" "${HEADER_FILE}")
-        string(APPEND HEADER_CONTENT "#include \"${RELATIVE_HEADER_FILE}\"\n")
-    endforeach()
-
-    if (EXISTS "${OUTPUT_FILE}")
-        file(READ "${OUTPUT_FILE}" EXISTING_CONTENT)
-        if (EXISTING_CONTENT STREQUAL HEADER_CONTENT)
-            return()
-        endif()
-    endif()
-
-    file(WRITE "${OUTPUT_FILE}" "${HEADER_CONTENT}")
-endfunction()
-
-generate_aggregate_header(
-    "${CMAKE_CURRENT_SOURCE_DIR}/api"
-    "${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
-)
-
 set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
 set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")