ocornut 514a97a9b7 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdlrenderer2.cpp
#	backends/imgui_impl_sdlrenderer2.h
#	backends/imgui_impl_sdlrenderer3.cpp
#	backends/imgui_impl_sdlrenderer3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp

2024-10-14 19:23:23 +02:00

..

vulkan

…

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2024-10-07 22:05:57 +02:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_android.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_android.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_dx9.cpp

Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)

2024-10-08 20:47:24 +02:00

imgui_impl_dx9.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_dx10.cpp

Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)

2024-10-08 20:47:24 +02:00

imgui_impl_dx10.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_dx11.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking

2024-08-01 19:07:53 +02:00

imgui_impl_glut.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_glut.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_metal.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_opengl2.cpp

Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)

2024-10-08 20:47:24 +02:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_opengl3_loader.h

Backends: DX9, DX10, DX11, DX12, OpenGL, Vulkan, WGPU: Changed default texture sampler to Clamp instead of Repeat/Wrap. (#7468, #7511, #5999, #5502)

2024-10-07 22:02:55 +02:00

imgui_impl_opengl3.cpp

Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)

2024-10-08 20:47:24 +02:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_osx.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_osx.mm

Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)

2024-10-08 20:47:24 +02:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_sdl2.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_sdl3.h

Backends: SDL3: added support for viewport->ParentViewportId field to support parenting windows at OS level. (#7973)

2024-09-12 19:35:31 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2024-10-14 19:23:23 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

2024-07-29 23:18:54 +02:00