Update submodules

elishacloud · Mar 10, 2024 · f5014fb · f5014fb
1 parent 5da52d7
commit f5014fb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 6959 
+#define BUILD_NUMBER 6960 
diff --git a/External/d3d8to9 b/External/d3d8to9
diff --git a/External/dinputto8 b/External/dinputto8
diff --git a/External/imgui b/External/imgui
diff --git a/d3d9/DebugOverlay.cpp b/d3d9/DebugOverlay.cpp
@@ -129,8 +129,7 @@ void DebugOverlay::BeginScene()
 void DebugOverlay::EndScene()
 {
 	static bool ShowDebugUI = false;
-	if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftAlt)) &&
-		ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_D), false))
+	if (ImGui::IsKeyDown(ImGuiKey_LeftAlt) && ImGui::IsKeyPressed(ImGuiKey_D, false))
 	{
 		ShowDebugUI = !ShowDebugUI;
 	}

diff --git a/d3d9/IDirect3DDevice9Ex.cpp b/d3d9/IDirect3DDevice9Ex.cpp
@@ -103,6 +103,8 @@ HRESULT m_IDirect3DDevice9Ex::ResetT(T func, D3DPRESENT_PARAMETERS &d3dpp, D3DPR
 	DOverlay.Shutdown();
 #endif
 
+	ProxyInterface->EndScene();		// Required for some games when using WineD3D
+
 	HRESULT hr;
 
 	// Check fullscreen
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BUILD_NUMBER 6959
		#define BUILD_NUMBER 6960
+1 −0		.github/ISSUE_TEMPLATE/config.yml
+90 −0		.github/ISSUE_TEMPLATE/issue_template.yml
+0 −46		.github/issue_template.md
+7 −7		.github/workflows/build.yml
+1 −1		.github/workflows/static-analysis.yml
+1 −1		LICENSE.txt
+1 −1		backends/imgui_impl_allegro5.cpp
+25 −3		backends/imgui_impl_dx9.cpp
+45 −7		backends/imgui_impl_glfw.cpp
+5 −0		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_opengl2.cpp
+28 −19		backends/imgui_impl_opengl3.cpp
+6 −0		backends/imgui_impl_opengl3_loader.h
+0 −1		backends/imgui_impl_osx.mm
+131 −52		backends/imgui_impl_sdl2.cpp
+5 −3		backends/imgui_impl_sdl2.h
+131 −52		backends/imgui_impl_sdl3.cpp
+6 −0		backends/imgui_impl_sdl3.h
+4 −5		backends/imgui_impl_sdlrenderer3.cpp
+134 −121		backends/imgui_impl_vulkan.cpp
+28 −9		backends/imgui_impl_vulkan.h
+46 −21		backends/imgui_impl_wgpu.cpp
+18 −1		backends/imgui_impl_wgpu.h
+234 −20		docs/CHANGELOG.txt
+1 −1		docs/CONTRIBUTING.md
+1 −1		docs/FAQ.md
+2 −2		docs/FONTS.md
+8 −4		docs/README.md
+0 −0		examples/example_emscripten_wgpu/Makefile.emscripten
+1 −1		examples/example_emscripten_wgpu/README.md
+164 −136		examples/example_emscripten_wgpu/main.cpp
+2 −2		examples/example_glfw_metal/Makefile
+1 −1		examples/example_glfw_opengl3/Makefile.emscripten
+3 −0		examples/example_glfw_opengl3/main.cpp
+12 −11		examples/example_glfw_vulkan/main.cpp
+6 −0		examples/example_sdl2_directx11/main.cpp
+6 −0		examples/example_sdl2_opengl2/main.cpp
+6 −0		examples/example_sdl2_opengl3/main.cpp
+5 −0		examples/example_sdl2_sdlrenderer2/main.cpp
+17 −11		examples/example_sdl2_vulkan/main.cpp
+1 −1		examples/example_sdl3_opengl3/main.cpp
+1 −1		examples/example_sdl3_sdlrenderer3/main.cpp
+821 −353		imgui.cpp
+66 −48		imgui.h
+163 −63		imgui_demo.cpp
+319 −8		imgui_draw.cpp
+240 −145		imgui_internal.h
+67 −29		imgui_tables.cpp
+107 −76		imgui_widgets.cpp
+1 −1		misc/freetype/imgui_freetype.cpp