Skip to content

Commit 8ca64b6

Browse files
joeyhodgejoeyhodge
authored
Merge branch 'praydog:master' into apollo-justice-vr-gui-placement
2 parents 3772c10 + ee8f0d9 commit 8ca64b6

11 files changed

Lines changed: 632 additions & 276 deletions

‎CMakeLists.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2372,6 +2372,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
23722372
"src/D3D12Hook.hpp"
23732373
"src/DInputHook.cpp"
23742374
"src/DInputHook.hpp"
2375+
"src/DisasmUtils.hpp"
23752376
"src/ExceptionHandler.cpp"
23762377
"src/ExceptionHandler.hpp"
23772378
"src/Genny.hpp"
@@ -2576,6 +2577,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
25762577
"src/D3D12Hook.hpp"
25772578
"src/DInputHook.cpp"
25782579
"src/DInputHook.hpp"
2580+
"src/DisasmUtils.hpp"
25792581
"src/ExceptionHandler.cpp"
25802582
"src/ExceptionHandler.hpp"
25812583
"src/Genny.hpp"
@@ -4699,6 +4701,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
46994701
"src/D3D12Hook.hpp"
47004702
"src/DInputHook.cpp"
47014703
"src/DInputHook.hpp"
4704+
"src/DisasmUtils.hpp"
47024705
"src/ExceptionHandler.cpp"
47034706
"src/ExceptionHandler.hpp"
47044707
"src/Genny.hpp"
@@ -4903,6 +4906,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
49034906
"src/D3D12Hook.hpp"
49044907
"src/DInputHook.cpp"
49054908
"src/DInputHook.hpp"
4909+
"src/DisasmUtils.hpp"
49064910
"src/ExceptionHandler.cpp"
49074911
"src/ExceptionHandler.hpp"
49084912
"src/Genny.hpp"
@@ -5107,6 +5111,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
51075111
"src/D3D12Hook.hpp"
51085112
"src/DInputHook.cpp"
51095113
"src/DInputHook.hpp"
5114+
"src/DisasmUtils.hpp"
51105115
"src/ExceptionHandler.cpp"
51115116
"src/ExceptionHandler.hpp"
51125117
"src/Genny.hpp"
@@ -8191,6 +8196,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
81918196
"src/D3D12Hook.hpp"
81928197
"src/DInputHook.cpp"
81938198
"src/DInputHook.hpp"
8199+
"src/DisasmUtils.hpp"
81948200
"src/ExceptionHandler.cpp"
81958201
"src/ExceptionHandler.hpp"
81968202
"src/Genny.hpp"
@@ -8395,6 +8401,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
83958401
"src/D3D12Hook.hpp"
83968402
"src/DInputHook.cpp"
83978403
"src/DInputHook.hpp"
8404+
"src/DisasmUtils.hpp"
83988405
"src/ExceptionHandler.cpp"
83998406
"src/ExceptionHandler.hpp"
84008407
"src/Genny.hpp"
@@ -9560,6 +9567,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
95609567
"src/D3D12Hook.hpp"
95619568
"src/DInputHook.cpp"
95629569
"src/DInputHook.hpp"
9570+
"src/DisasmUtils.hpp"
95639571
"src/ExceptionHandler.cpp"
95649572
"src/ExceptionHandler.hpp"
95659573
"src/Genny.hpp"
@@ -10723,6 +10731,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1072310731
"src/D3D12Hook.hpp"
1072410732
"src/DInputHook.cpp"
1072510733
"src/DInputHook.hpp"
10734+
"src/DisasmUtils.hpp"
1072610735
"src/ExceptionHandler.cpp"
1072710736
"src/ExceptionHandler.hpp"
1072810737
"src/Genny.hpp"
@@ -11888,6 +11897,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1188811897
"src/D3D12Hook.hpp"
1188911898
"src/DInputHook.cpp"
1189011899
"src/DInputHook.hpp"
11900+
"src/DisasmUtils.hpp"
1189111901
"src/ExceptionHandler.cpp"
1189211902
"src/ExceptionHandler.hpp"
1189311903
"src/Genny.hpp"
@@ -13053,6 +13063,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1305313063
"src/D3D12Hook.hpp"
1305413064
"src/DInputHook.cpp"
1305513065
"src/DInputHook.hpp"
13066+
"src/DisasmUtils.hpp"
1305613067
"src/ExceptionHandler.cpp"
1305713068
"src/ExceptionHandler.hpp"
1305813069
"src/Genny.hpp"
@@ -14218,6 +14229,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1421814229
"src/D3D12Hook.hpp"
1421914230
"src/DInputHook.cpp"
1422014231
"src/DInputHook.hpp"
14232+
"src/DisasmUtils.hpp"
1422114233
"src/ExceptionHandler.cpp"
1422214234
"src/ExceptionHandler.hpp"
1422314235
"src/Genny.hpp"
@@ -15383,6 +15395,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1538315395
"src/D3D12Hook.hpp"
1538415396
"src/DInputHook.cpp"
1538515397
"src/DInputHook.hpp"
15398+
"src/DisasmUtils.hpp"
1538615399
"src/ExceptionHandler.cpp"
1538715400
"src/ExceptionHandler.hpp"
1538815401
"src/Genny.hpp"
@@ -16548,6 +16561,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1654816561
"src/D3D12Hook.hpp"
1654916562
"src/DInputHook.cpp"
1655016563
"src/DInputHook.hpp"
16564+
"src/DisasmUtils.hpp"
1655116565
"src/ExceptionHandler.cpp"
1655216566
"src/ExceptionHandler.hpp"
1655316567
"src/Genny.hpp"
@@ -17713,6 +17727,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1771317727
"src/D3D12Hook.hpp"
1771417728
"src/DInputHook.cpp"
1771517729
"src/DInputHook.hpp"
17730+
"src/DisasmUtils.hpp"
1771617731
"src/ExceptionHandler.cpp"
1771717732
"src/ExceptionHandler.hpp"
1771817733
"src/Genny.hpp"
@@ -18878,6 +18893,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
1887818893
"src/D3D12Hook.hpp"
1887918894
"src/DInputHook.cpp"
1888018895
"src/DInputHook.hpp"
18896+
"src/DisasmUtils.hpp"
1888118897
"src/ExceptionHandler.cpp"
1888218898
"src/ExceptionHandler.hpp"
1888318899
"src/Genny.hpp"
@@ -20043,6 +20059,7 @@ if(REF_BUILD_FRAMEWORK AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework
2004320059
"src/D3D12Hook.hpp"
2004420060
"src/DInputHook.cpp"
2004520061
"src/DInputHook.hpp"
20062+
"src/DisasmUtils.hpp"
2004620063
"src/ExceptionHandler.cpp"
2004720064
"src/ExceptionHandler.hpp"
2004820065
"src/Genny.hpp"

0 commit comments

Comments
 (0)