ocornut 085781f5ca Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

2024-03-18 22:52:40 -07: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-02-07 22:10:33 +01:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_android.cpp

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

2023-12-14 17:21:15 +01:00

imgui_impl_android.h

Merge branch 'master' into docking

2023-11-28 14:39:46 +01:00

imgui_impl_dx9.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_dx9.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_dx10.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_dx11.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_glfw.cpp

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_glfw.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_glut.cpp

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_glut.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_metal.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL3: Backup and restore GL_PIXEL_UNPACK_BUFFER. (#7253)

2024-01-24 15:01:59 +01:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_osx.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_osx.mm

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_sdl2.cpp

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_sdl2.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2024-03-18 22:52:40 -07:00

imgui_impl_sdl3.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_vulkan.cpp

Backends: Vulkan: ImGui_ImplVulkan_CreateWindow() amend merge to take account of PipelineRenderingCreateInfo change. (#7166, #6855, #5446, #5037)

2024-02-14 14:39:26 +01:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2024-02-14 14:32:17 +01:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2024-01-22 19:01:25 +01:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2024-01-22 19:01:25 +01:00

imgui_impl_win32.cpp

Backends: Win32: made it so that an appearing viewport showing up doesn't bring its parent viewport to front. (#7354)

2024-02-27 20:02:26 +01:00

imgui_impl_win32.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00