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

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

2024-08-22 20:26:59 +02:00

..

vulkan

Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)

2020-10-14 14:41:40 +02:00

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2024-08-22 20:26:59 +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

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

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

imgui_impl_dx9.h

Merge branch 'master' into docking

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

imgui_impl_dx10.cpp

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

2024-05-14 16:29:06 +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 (incl merge moved CurrentDpiScale field)

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

imgui_impl_dx11.h

Merge branch 'master' into docking

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

imgui_impl_dx12.cpp

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

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

imgui_impl_dx12.h

Merge branch 'master' into docking

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

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2024-08-22 20:26:59 +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 (incl merge moved CurrentDpiScale field)

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

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2024-06-28 16:03:49 +02:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

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

imgui_impl_opengl3_loader.h

Fixed typos. (#7593)

2024-05-16 16:13:01 +02:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2024-07-25 16:41:56 +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

Merge branch 'master' into docking

2024-08-22 20:26:59 +02:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2024-08-22 20:26:59 +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-08-22 20:26:59 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

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

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2024-05-16 19:57:04 +02:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

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

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2024-07-01 17:10:12 +02:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

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

imgui_impl_vulkan.cpp

Backends: Vulkan: ImGui_ImplVulkan_SwapBuffers() still proceeds increasing counts on VK_SUBOPTIMAL_KHR. (#7825, #3881)

2024-07-29 15:48:54 +02:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

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

imgui_impl_wgpu.cpp

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

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

imgui_impl_wgpu.h

Merge branch 'master' into docking

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

imgui_impl_win32.cpp

Backends: SDL2, SDL3, Win32: don't submit monitor with 0 DpiScale (e.g. accessibility virtual monitor?). to prevent assert. (#7902)

2024-08-19 12:19:06 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

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