Branch Sync

minecraft-linux · Dec 12, 2024 · e351f89 · e351f89
1 parent e1b6513
commit e351f89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/imgui b/imgui
diff --git a/sdl3 b/sdl3
+6 −5		backends/imgui_impl_vulkan.cpp
+26 −7		docs/CHANGELOG.txt
+1 −1		docs/README.md
+3 −0		imconfig.h
+27 −5		imgui.cpp
+9 −9		imgui.h
+3 −1		imgui_demo.cpp
+10 −13		imgui_draw.cpp
+5 −7		imgui_internal.h
+1 −1		imgui_tables.cpp
+4 −4		imgui_widgets.cpp
+0 −1		build-scripts/rename_macros.py
+0 −1		docs/README-migration.md
+3 −42		docs/README-ngage.md
+1 −1		examples/CMakeLists.txt
+4 −4		examples/audio/04-multiple-streams/README.txt
+58 −74		examples/audio/04-multiple-streams/multiple-streams.c
+83 −26		include/SDL3/SDL_gpu.h
+0 −7		include/SDL3/SDL_main.h
+0 −12		include/SDL3/SDL_main_impl.h
+0 −10		include/SDL3/SDL_platform_defines.h
+0 −2		include/build_config/SDL_build_config.h
+0 −99		include/build_config/SDL_build_config_ngage.h
+0 −2		src/SDL.c
+4 −7		src/dynapi/SDL_dynapi.c
+0 −2		src/dynapi/SDL_dynapi.h
+2 −0		src/dynapi/SDL_dynapi.sym
+2 −0		src/dynapi/SDL_dynapi_overrides.h
+2 −0		src/dynapi/SDL_dynapi_procs.h
+56 −6		src/gpu/SDL_gpu.c
+13 −0		src/gpu/SDL_sysgpu.h
+65 −9		src/gpu/d3d12/SDL_gpu_d3d12.c
+64 −7		src/gpu/metal/SDL_gpu_metal.m
+62 −7		src/gpu/vulkan/SDL_gpu_vulkan.c
+0 −77		src/main/ngage/SDL_sysmain_runapp.cpp
+1 −5		src/stdlib/SDL_vacopy.h
+0 −2		src/thread/SDL_thread_c.h
+0 −100		src/thread/ngage/SDL_sysmutex.cpp
+0 −157		src/thread/ngage/SDL_syssem.cpp
+0 −112		src/thread/ngage/SDL_systhread.cpp
+0 −23		src/thread/ngage/SDL_systhread_c.h
+0 −59		src/timer/ngage/SDL_systimer.cpp
+0 −1		src/video/SDL_sysvideo.h
+0 −3		src/video/SDL_video.c
+0 −192		src/video/ngage/SDL_ngageevents.cpp
+0 −26		src/video/ngage/SDL_ngageevents_c.h
+0 −380		src/video/ngage/SDL_ngageframebuffer.cpp
+0 −36		src/video/ngage/SDL_ngageframebuffer_c.h
+0 −164		src/video/ngage/SDL_ngagevideo.cpp
+0 −65		src/video/ngage/SDL_ngagevideo.h
+0 −125		src/video/ngage/SDL_ngagewindow.cpp
+0 −38		src/video/ngage/SDL_ngagewindow.h
+8 −0		test/LICENSE.txt
+ −		test/sword.wav