Merge pull request JoeyAnthony#22 from JoeyAnthony/feature/update-res…

…hade-6.2.0 Updated ReShade to 6.2.0 & Imgui to c6aa051
LeiaInc · Aug 31, 2024 · 72b1e51 · 72b1e51
2 parents bc7e572 + 4ec3575
commit 72b1e51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gamebridge_reshade/third-party/imgui/include/imgui b/gamebridge_reshade/third-party/imgui/include/imgui
diff --git a/gamebridge_reshade/third-party/reshade/include/reshade b/gamebridge_reshade/third-party/reshade/include/reshade
+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
+12 −10		backends/imgui_impl_android.cpp
+1 −1		backends/imgui_impl_android.h
+1 −1		backends/imgui_impl_dx10.cpp
+1 −1		backends/imgui_impl_dx11.cpp
+2 −2		backends/imgui_impl_dx12.cpp
+26 −4		backends/imgui_impl_dx9.cpp
+56 −15		backends/imgui_impl_glfw.cpp
+5 −0		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_metal.mm
+2 −2		backends/imgui_impl_opengl2.cpp
+29 −20		backends/imgui_impl_opengl3.cpp
+8 −2		backends/imgui_impl_opengl3_loader.h
+2 −1		backends/imgui_impl_osx.h
+41 −16		backends/imgui_impl_osx.mm
+135 −56		backends/imgui_impl_sdl2.cpp
+5 −3		backends/imgui_impl_sdl2.h
+137 −58		backends/imgui_impl_sdl3.cpp
+6 −0		backends/imgui_impl_sdl3.h
+4 −5		backends/imgui_impl_sdlrenderer3.cpp
+160 −142		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
+1 −1		backends/imgui_impl_win32.cpp
+255 −1		docs/CHANGELOG.txt
+1 −1		docs/CONTRIBUTING.md
+1 −1		docs/FAQ.md
+4 −8		docs/FONTS.md
+6 −4		docs/README.md
+0 −0		examples/example_emscripten_wgpu/Makefile.emscripten
+1 −1		examples/example_emscripten_wgpu/README.md
+163 −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
+3 −3		examples/example_sdl3_sdlrenderer3/main.cpp
+7 −7		examples/example_win32_opengl3/main.cpp
+3 −1		imconfig.h
+943 −452		imgui.cpp
+245 −219		imgui.h
+167 −67		imgui_demo.cpp
+8 −8		imgui_draw.cpp
+269 −163		imgui_internal.h
+66 −28		imgui_tables.cpp
+163 −117		imgui_widgets.cpp
+72 −71		imstb_textedit.h
+1 −1		misc/freetype/imgui_freetype.cpp
+1 −2		misc/freetype/imgui_freetype.h