ocornut e43fd75378 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_sdlgpu3.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.cpp

2025-06-11 19:04:44 +02:00

..

sdlgpu3

Backends: SDLGPU3: Added sdl_gpu backend (amends). (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

vulkan

Backends: SDLGPU3: Added sdl_gpu backend (amends). (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

imgui_impl_allegro5.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_allegro5.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_android.cpp

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_android.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_dx9.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx9.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx10.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx10.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx11.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx11.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_dx12.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_glfw.cpp

Backends: GLFW, SDL2, SDL3, update for docking to use helpers.

2025-06-11 18:07:43 +02:00

imgui_impl_glfw.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_glut.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_glut.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_metal.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_metal.mm

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_opengl2.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL3: added ImGuiBackendFlags_RendererHasTextures support.

2025-06-11 15:29:14 +02:00

imgui_impl_opengl3.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_opengl3.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_osx.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_osx.mm

Merge remote-tracking branch 'origin/master' into docking

2025-05-15 14:45:15 +02:00

imgui_impl_sdl2.cpp

Backends: GLFW, SDL2, SDL3, update for docking to use helpers.

2025-06-11 18:07:43 +02:00

imgui_impl_sdl2.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_sdl3.cpp

Backends: GLFW, SDL2, SDL3, update for docking to use helpers.

2025-06-11 18:07:43 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_sdlgpu3_shaders.h

Backends: SDLGPU3: Added sdl_gpu backend. (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

imgui_impl_sdlgpu3.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlgpu3.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_vulkan.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_win32.cpp

(Breaking) renamed/moved ImGuiConfigFlags_DpiEnableScaleFonts -> ioConfigDpiScaleFonts, ImGuiConfigFlags_DpiEnableScaleViewports -> io.ConfigDpiScaleViewports

2025-06-11 15:02:06 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00