Branch Sync

minecraft-linux · Jul 4, 2024 · 0538e8a · 0538e8a
1 parent 856f080
commit 0538e8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/game-window b/game-window
diff --git a/imgui b/imgui
diff --git a/sdl3 b/sdl3
+8 −0		backends/imgui_impl_glfw.cpp
+2 −1		backends/imgui_impl_osx.mm
+19 −5		backends/imgui_impl_sdl2.cpp
+57 −50		backends/imgui_impl_sdl3.cpp
+2 −3		backends/imgui_impl_sdl3.h
+44 −4		docs/CHANGELOG.txt
+1 −1		docs/FAQ.md
+20 −0		examples/imgui_examples.sln
+4 −0		imconfig.h
+90 −19		imgui.cpp
+38 −14		imgui.h
+23 −7		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
+1 −0		android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+104 −0		build-scripts/SDL_migration.cocci
+31 −2		docs/README-migration.md
+1 −1		docs/README-wayland.md
+151 −10		include/SDL3/SDL_audio.h
+9 −1		include/SDL3/SDL_events.h
+6 −6		include/SDL3/SDL_hints.h
+6 −4		include/SDL3/SDL_keyboard.h
+27 −52		include/SDL3/SDL_keycode.h
+52 −0		include/SDL3/SDL_oldnames.h
+2 −0		include/SDL3/SDL_scancode.h
+0 −17		include/SDL3/SDL_video.h
+2 −0		src/SDL.c
+70 −17		src/audio/SDL_audio.c
+175 −47		src/audio/SDL_audiocvt.c
+9 −10		src/audio/SDL_audioqueue.c
+2 −2		src/audio/SDL_audioqueue.h
+18 −4		src/audio/SDL_sysaudio.h
+32 −112		src/audio/alsa/SDL_alsa_audio.c
+1 −0		src/audio/pulseaudio/SDL_pulseaudio.c
+1 −0		src/audio/qnx/SDL_qsa_audio.c
+8 −9		src/camera/mediafoundation/SDL_camera_mediafoundation.c
+0 −5		src/core/haiku/SDL_BApp.h
+4 −4		src/core/linux/SDL_evdev.c
+4 −1		src/dynapi/SDL_dynapi.sym
+4 −1		src/dynapi/SDL_dynapi_overrides.h
+4 −1		src/dynapi/SDL_dynapi_procs.h
+1 −2		src/events/SDL_events.c
+1 −0		src/events/SDL_events_c.h
+176 −58		src/events/SDL_keyboard.c
+1 −4		src/events/SDL_keyboard_c.h
+18 −9		src/events/SDL_keymap.c
+1 −0		src/hidapi/libusb/hid.c
+4 −4		src/joystick/SDL_gamepad.c
+5 −0		src/joystick/SDL_joystick.c
+1 −0		src/joystick/hidapi/SDL_hidapijoystick.c
+2 −0		src/joystick/usb_ids.h
+0 −16		src/test/SDL_test_common.c
+30 −38		src/test/SDL_test_memory.c
+0 −1		src/video/SDL_sysvideo.h
+0 −12		src/video/SDL_video.c
+1 −1		src/video/cocoa/SDL_cocoakeyboard.m
+18 −341		src/video/emscripten/SDL_emscriptenevents.c
+0 −19		src/video/haiku/SDL_bkeyboard.cc
+0 −2		src/video/haiku/SDL_bkeyboard.h
+2 −2		src/video/uikit/SDL_uikitviewcontroller.m
+1 −1		src/video/wayland/SDL_waylandevents.c
+1 −7		src/video/windows/SDL_windowskeyboard.c
+0 −9		src/video/x11/SDL_x11events.c
+1 −24		src/video/x11/SDL_x11keyboard.c
+0 −1		src/video/x11/SDL_x11video.c
+0 −12		src/video/x11/SDL_x11window.c
+0 −1		src/video/x11/SDL_x11window.h
+1 −1		test/loopwave.c
+34 −1		test/testaudio.c
+8 −7		test/testaudiostreamdynamicresample.c
+21 −2		test/testautomation_audio.c
+2 −2		test/testautomation_keyboard.c
+6 −6		test/testcontroller.c
+2 −2		test/testffmpeg.c
+2 −2		test/testgl.c
+1 −1		test/testhittesting.c
+18 −16		test/testintersections.c
+4 −4		test/testmodal.c
+1 −1		test/testmouse.c
+1 −1		test/testwm.c
+305 −53		test/win32/sdlprocdump.c