Skip to content

Commit

Permalink
Branch Sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Jul 25, 2024
1 parent acafc3c commit 1e07d6d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion imgui
Submodule imgui updated 5 files
+2 −0 docs/CHANGELOG.txt
+7 −6 imgui.cpp
+1 −1 imgui.h
+4 −1 imgui_internal.h
+103 −93 imgui_widgets.cpp
2 changes: 1 addition & 1 deletion mcpelauncher-client
Submodule mcpelauncher-client updated 8 files
+2 −2 .github/workflows/ci.yml
+28 −33 src/imgui_ui.cpp
+27 −5 src/main.cpp
+0 −1 src/main.h
+18 −2 src/settings.cpp
+17 −1 src/settings.h
+6 −8 src/window_callbacks.cpp
+6 −2 src/window_callbacks.h
2 changes: 1 addition & 1 deletion sdl3
Submodule sdl3 updated 92 files
+3 −2 android-project/app/proguard-rules.pro
+2 −0 android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+22 −1 android-project/app/src/main/java/org/libsdl/app/SDLSurface.java
+12 −2 build-scripts/SDL_migration.cocci
+18 −1 build-scripts/build-web-examples.pl
+15 −2 build-scripts/create-android-project.py
+74 −29 docs/README-android.md
+4 −1 docs/README-migration.md
+14 −10 examples/CMakeLists.txt
+102 −0 examples/audio/01-simple-playback/simple-playback.c
+114 −0 examples/audio/02-simple-playback-callback/simple-playback-callback.c
+1 −0 examples/audio/03-load-wav/datafiles.txt
+104 −0 examples/audio/03-load-wav/load-wav.c
+5 −0 examples/renderer/01-clear/renderer-clear.c
+93 −0 examples/renderer/02-primitives/renderer-primitives.c
+7 −1 examples/template.c
+6 −4 include/SDL3/SDL_events.h
+0 −15 include/SDL3/SDL_hints.h
+5 −5 include/SDL3/SDL_mutex.h
+6 −2 include/SDL3/SDL_oldnames.h
+20 −0 include/SDL3/SDL_render.h
+3 −2 include/SDL3/SDL_stdinc.h
+3 −2 include/SDL3/SDL_system.h
+37 −5 include/SDL3/SDL_video.h
+9 −0 src/SDL.c
+2 −2 src/audio/aaudio/SDL_aaudio.c
+2 −2 src/audio/coreaudio/SDL_coreaudio.m
+3 −3 src/audio/openslES/SDL_openslES.c
+1 −1 src/audio/pulseaudio/SDL_pulseaudio.c
+3 −3 src/audio/wasapi/SDL_wasapi.c
+2 −2 src/audio/wasapi/SDL_wasapi_winrt.cpp
+141 −60 src/core/android/SDL_android.c
+22 −7 src/core/android/SDL_android.h
+9 −7 src/dynapi/SDL_dynapi.sym
+9 −7 src/dynapi/SDL_dynapi_overrides.h
+9 −7 src/dynapi/SDL_dynapi_procs.h
+1 −1 src/dynapi/gendynapi.py
+72 −12 src/events/SDL_events.c
+2 −2 src/events/SDL_quit.c
+1 −0 src/events/SDL_windowevents.c
+25 −25 src/joystick/apple/SDL_mfijoystick.m
+2 −2 src/joystick/hidapi/SDL_hidapi_rumble.c
+1 −1 src/locale/SDL_locale.c
+4 −0 src/main/ios/SDL_sysmain_callbacks.m
+66 −13 src/render/SDL_render.c
+39 −39 src/render/metal/SDL_render_metal.m
+1 −1 src/sensor/android/SDL_androidsensor.c
+17 −0 src/test/SDL_test_common.c
+3 −3 src/thread/generic/SDL_syscond.c
+1 −1 src/thread/generic/SDL_sysmutex.c
+2 −2 src/thread/generic/SDL_syssem.c
+1 −1 src/thread/n3ds/SDL_syssem.c
+1 −1 src/thread/ngage/SDL_syssem.cpp
+1 −1 src/thread/ps2/SDL_syssem.c
+1 −1 src/thread/psp/SDL_syssem.c
+1 −1 src/thread/pthread/SDL_syssem.c
+1 −1 src/thread/vita/SDL_syssem.c
+7 −7 src/thread/windows/SDL_syssem.c
+2 −2 src/timer/SDL_timer.c
+7 −0 src/video/SDL_sysvideo.h
+130 −66 src/video/SDL_video.c
+142 −129 src/video/android/SDL_androidevents.c
+4 −4 src/video/android/SDL_androidevents.h
+7 −4 src/video/android/SDL_androidgl.c
+0 −11 src/video/android/SDL_androidvideo.c
+0 −3 src/video/android/SDL_androidvideo.h
+9 −6 src/video/android/SDL_androidwindow.c
+11 −11 src/video/cocoa/SDL_cocoaevents.m
+3 −3 src/video/cocoa/SDL_cocoakeyboard.m
+4 −4 src/video/cocoa/SDL_cocoamessagebox.m
+1 −1 src/video/cocoa/SDL_cocoametalview.h
+6 −6 src/video/cocoa/SDL_cocoametalview.m
+1 −1 src/video/cocoa/SDL_cocoamouse.m
+1 −1 src/video/cocoa/SDL_cocoaopengl.h
+10 −10 src/video/cocoa/SDL_cocoaopengl.m
+2 −2 src/video/cocoa/SDL_cocoavideo.h
+1 −1 src/video/cocoa/SDL_cocoavulkan.m
+3 −3 src/video/cocoa/SDL_cocoawindow.h
+31 −15 src/video/cocoa/SDL_cocoawindow.m
+2 −2 src/video/psp/SDL_pspevents.c
+2 −0 src/video/uikit/SDL_uikitevents.h
+23 −17 src/video/uikit/SDL_uikitevents.m
+8 −1 src/video/uikit/SDL_uikitmetalview.m
+3 −0 src/video/uikit/SDL_uikitview.h
+17 −0 src/video/uikit/SDL_uikitview.m
+78 −29 src/video/x11/SDL_x11modes.c
+1 −1 test/testatomic.c
+2 −2 test/testgles2.c
+3 −3 test/testsem.c
+8 −3 test/testsprite.c
+6 −0 test/testvulkan.c
+3 −1 test/testwm.c

0 comments on commit 1e07d6d

Please sign in to comment.