Skip to content

Commit

Permalink
Merge branch 'master' into csharp-api
Browse files Browse the repository at this point in the history
  • Loading branch information
@praydog
praydog committed Mar 2, 2025
2 parents b14dba5 + e2b2756 commit 7f8f615
Show file tree
Hide file tree
Showing 31 changed files with 4,507 additions and 57 deletions.
47 changes: 43 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ FetchContent_Declare(
)
FetchContent_MakeAvailable(directxtk)

message(STATUS "Fetching directxtk12 (528801aa6dd8d628c2f756c41a76d300f47de478)...")
message(STATUS "Fetching directxtk12 (be5dfc7e391aefaa4eeab8e8a08f7e2669e56cbb)...")
FetchContent_Declare(
directxtk12
GIT_REPOSITORY
https://github.com/microsoft/DirectXTK12
GIT_TAG
528801aa6dd8d628c2f756c41a76d300f47de478
be5dfc7e391aefaa4eeab8e8a08f7e2669e56cbb
)
FetchContent_MakeAvailable(directxtk12)

Expand All @@ -152,13 +152,13 @@ FetchContent_Declare(
)
FetchContent_MakeAvailable(bddisasm)

message(STATUS "Fetching kananlib (61a04d4219e3cb81b524a6990d3924289982bbf6)...")
message(STATUS "Fetching kananlib (d659e3b8312e26ba19329f96b73ba88d1211bfdb)...")
FetchContent_Declare(
kananlib
GIT_REPOSITORY
https://github.com/cursey/kananlib
GIT_TAG
61a04d4219e3cb81b524a6990d3924289982bbf6
d659e3b8312e26ba19329f96b73ba88d1211bfdb
)
FetchContent_MakeAvailable(kananlib)

Expand Down Expand Up @@ -2243,6 +2243,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -2293,6 +2294,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -2331,6 +2333,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -2450,6 +2453,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -2500,6 +2504,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -2538,6 +2543,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -4322,6 +4328,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -4372,6 +4379,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -4410,6 +4418,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -4529,6 +4538,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -4579,6 +4589,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -4617,6 +4628,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -4736,6 +4748,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -4786,6 +4799,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -4824,6 +4838,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -7442,6 +7457,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -7492,6 +7508,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -7530,6 +7547,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -7649,6 +7667,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -7699,6 +7718,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -7737,6 +7757,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -8690,6 +8711,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -8740,6 +8762,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -8778,6 +8801,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -9729,6 +9753,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -9779,6 +9804,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -9817,6 +9843,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -10770,6 +10797,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -10820,6 +10848,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -10858,6 +10887,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -11811,6 +11841,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -11861,6 +11892,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -11899,6 +11931,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -12852,6 +12885,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -12902,6 +12936,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -12940,6 +12975,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down Expand Up @@ -13893,6 +13929,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowsMessageHook.cpp"
"src/cimgui/cimgui.cpp"
"src/mods/APIProxy.cpp"
"src/mods/BackBufferRenderer.cpp"
"src/mods/Camera.cpp"
"src/mods/DeveloperTools.cpp"
"src/mods/FirstPerson.cpp"
Expand Down Expand Up @@ -13943,6 +13980,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/WindowFilter.hpp"
"src/WindowsMessageHook.hpp"
"src/mods/APIProxy.hpp"
"src/mods/BackBufferRenderer.hpp"
"src/mods/Camera.hpp"
"src/mods/DeveloperTools.hpp"
"src/mods/FirstPerson.hpp"
Expand Down Expand Up @@ -13981,6 +14019,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
"src/re2-imgui/re2_imconfig.hpp"
"src/utility/ImGui.hpp"
"src/cimgui/cimgui.h"
"src/mods/spritefonts/Roboto.spritefont.h"
"src/re2-imgui/af_fadef.h"
"src/re2-imgui/imgui_impl_dx11.h"
"src/re2-imgui/imgui_impl_dx12.h"
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Supports both DirectX 11 and DirectX 12.
* Devil May Cry 5
* Street Fighter 6
* Monster Hunter Rise
* Monster Hunter Wilds
* Dragon's Dogma 2
* Ghosts 'n Goblins Resurrection (Using RE8 build)
* Apollo Justice: Ace Attorney Trilogy (Using DD2 build)
Expand Down
4 changes: 2 additions & 2 deletions cmake.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ tag = "f5026eb34e7053b1aff325d38db107703f394974"

[fetch-content.directxtk12]
git = "https://github.com/microsoft/DirectXTK12"
tag = "528801aa6dd8d628c2f756c41a76d300f47de478"
tag = "be5dfc7e391aefaa4eeab8e8a08f7e2669e56cbb"

[target.spdlog]
cmake-after="""
Expand Down Expand Up @@ -190,7 +190,7 @@ tag = "v1.34.10"

[fetch-content.kananlib]
git = "https://github.com/cursey/kananlib"
tag = "61a04d4219e3cb81b524a6990d3924289982bbf6"
tag = "d659e3b8312e26ba19329f96b73ba88d1211bfdb"

[target.utility]
type = "static"
Expand Down
Loading

0 comments on commit 7f8f615

Please sign in to comment.