diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index f0dd01ec..65427006 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -447,22 +447,6 @@
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index 36e6c40a..9b0fc4bc 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -893,18 +893,6 @@
windows
-
- thirdparty\detours
-
-
- thirdparty\detours
-
-
- thirdparty\detours
-
-
- thirdparty\detours
-
sdk\mathlib
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index 89f0c30c..9faf2cb1 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -77,58 +77,7 @@
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- NotUsing
- NotUsing
-
-
- Use
- Use
-
-
- NotUsing
- NotUsing
-
+
@@ -535,7 +484,7 @@
true
false
..\GameSDK.def
- d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)
+ d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)
$(SolutionDir)lib\$(Configuration)\
@@ -576,7 +525,7 @@
true
false
..\GameSDK.def
- d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)
+ d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)
$(SolutionDir)lib\$(Configuration)\
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 55b73184..02e657dd 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -228,30 +228,6 @@
sdk\squirrel
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
-
- thirdparty\imgui
-
sdk\tier0
@@ -303,9 +279,6 @@
core
-
- thirdparty\imgui
-
sdk\common
@@ -345,18 +318,6 @@
windows
-
- thirdparty\detours
-
-
- thirdparty\detours
-
-
- thirdparty\detours
-
-
- thirdparty\detours
-
sdk\mathlib
@@ -411,6 +372,9 @@
sdk\networksystem
+
+ thirdparty\imgui
+
diff --git a/r5dev/vproj/libimgui.vcxproj b/r5dev/vproj/libimgui.vcxproj
new file mode 100644
index 00000000..0ffa765e
--- /dev/null
+++ b/r5dev/vproj/libimgui.vcxproj
@@ -0,0 +1,234 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
+
+
+ 16.0
+ Win32Proj
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}
+ libimgui
+ 10.0
+
+
+
+ StaticLibrary
+ true
+ v143
+ Unicode
+ Static
+
+
+ StaticLibrary
+ false
+ v143
+ true
+ Unicode
+ Static
+
+
+ StaticLibrary
+ true
+ v143
+ Unicode
+ Static
+
+
+ StaticLibrary
+ false
+ v143
+ true
+ Unicode
+ Static
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(SolutionDir)r5dev\;$(IncludePath);
+ $(SolutionDir)build\$(ProjectName)\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)\
+ libimgui_x86
+
+
+ false
+ $(SolutionDir)r5dev\;$(IncludePath);
+ $(SolutionDir)build\$(ProjectName)\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)\
+ libimgui_x86
+
+
+ true
+ $(SolutionDir)r5dev\;$(IncludePath);
+ $(SolutionDir)build\$(ProjectName)\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)\
+ libimgui_x64
+
+
+ false
+ $(SolutionDir)r5dev\;$(IncludePath);
+ $(SolutionDir)build\$(ProjectName)\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)\
+ libimgui_x64
+
+
+
+ Level3
+ true
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)
+ stdcpp17
+
+
+ Console
+ true
+
+
+
+
+ Level3
+ true
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)
+ stdcpp17
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)
+ stdcpp17
+
+
+ Console
+ true
+
+
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)
+ stdcpp17
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/r5dev/vproj/libimgui.vcxproj.filters b/r5dev/vproj/libimgui.vcxproj.filters
new file mode 100644
index 00000000..db6a65da
--- /dev/null
+++ b/r5dev/vproj/libimgui.vcxproj.filters
@@ -0,0 +1,50 @@
+
+
+
+
+ {83a57cdd-4776-47d1-b7c4-c6986dcbab9f}
+
+
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/r5sdk.sln b/r5sdk.sln
index ba14a64e..041e990f 100644
--- a/r5sdk.sln
+++ b/r5sdk.sln
@@ -8,6 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamesdk", "r5dev\vproj\game
{1CC6BF42-D20F-4599-8619-290AF5FB4034} = {1CC6BF42-D20F-4599-8619-290AF5FB4034}
{B273A875-6618-49FE-8CA4-0B693BA264D5} = {B273A875-6618-49FE-8CA4-0B693BA264D5}
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1} = {AD7B43E9-2416-4B39-829E-D9D2071479B1}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdklauncher", "r5dev\vproj\sdklauncher.vcxproj", "{18F8C75E-3844-4AA6-AB93-980A08253519}"
@@ -33,6 +34,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzham", "r5dev\vproj\lib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdetours", "r5dev\vproj\libdetours.vcxproj", "{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "thirdparty", "thirdparty", "{9D2825F8-4BEC-4D0A-B125-6390B554D519}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libimgui", "r5dev\vproj\libimgui.vcxproj", "{AD7B43E9-2416-4B39-829E-D9D2071479B1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -97,10 +102,24 @@ Global
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x64.Build.0 = Release|x64
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x86.ActiveCfg = Release|Win32
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x86.Build.0 = Release|Win32
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Debug|x64.ActiveCfg = Debug|x64
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Debug|x64.Build.0 = Debug|x64
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Debug|x86.ActiveCfg = Debug|Win32
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Debug|x86.Build.0 = Debug|Win32
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Release|x64.ActiveCfg = Release|x64
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Release|x64.Build.0 = Release|x64
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Release|x86.ActiveCfg = Release|Win32
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {B273A875-6618-49FE-8CA4-0B693BA264D5} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
+ {1CC6BF42-D20F-4599-8619-290AF5FB4034} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
+ {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
+ {AD7B43E9-2416-4B39-829E-D9D2071479B1} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5E5FE02E-6BCE-4BAF-9948-C56476039C3C}
EndGlobalSection