Merge branch 'ng' into sdl3-test-build-ng

minecraft-linux · Jul 12, 2024 · 13b24f8 · 13b24f8
2 parents ac00f0f + a88adf8
commit 13b24f8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/game-window b/game-window
diff --git a/imgui b/imgui
diff --git a/libc-shim b/libc-shim
diff --git a/mcpelauncher-client b/mcpelauncher-client
diff --git a/sdl3 b/sdl3
+2 −2		backends/imgui_impl_allegro5.cpp
+44 −18		backends/imgui_impl_glfw.cpp
+3 −2		backends/imgui_impl_glfw.h
+2 −1		backends/imgui_impl_osx.mm
+19 −5		backends/imgui_impl_sdl2.cpp
+59 −51		backends/imgui_impl_sdl3.cpp
+2 −3		backends/imgui_impl_sdl3.h
+26 −3		backends/imgui_impl_sdlrenderer3.cpp
+2 −1		backends/imgui_impl_win32.cpp
+58 −4		docs/CHANGELOG.txt
+1 −1		docs/FAQ.md
+1 −1		examples/example_glfw_opengl3/main.cpp
+14 −1		examples/example_glfw_wgpu/CMakeLists.txt
+1 −1		examples/example_glfw_wgpu/main.cpp
+0 −3		examples/example_sdl3_opengl3/main.cpp
+0 −3		examples/example_sdl3_sdlrenderer3/main.cpp
+20 −0		examples/imgui_examples.sln
+4 −0		imconfig.h
+111 −19		imgui.cpp
+38 −14		imgui.h
+24 −8		imgui_demo.cpp
+4 −1		imgui_draw.cpp
+21 −20		imgui_internal.h
+2 −2		imgui_tables.cpp
+111 −20		imgui_widgets.cpp
+1 −1		misc/freetype/imgui_freetype.cpp
+45 −29		src/imgui_ui.cpp
+2 −0		src/jni/jni_descriptors.cpp
+33 −1		src/jni/jni_support.cpp
+2 −0		src/jni/jni_support.h
+13 −2		src/jni/lib_http_client.cpp
+24 −1		src/jni/main_activity.cpp
+4 −8		src/jni/main_activity.h
+7 −1		src/main.cpp
+1 −0		src/main.h