ocornut 848d21b6b5 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	imgui.cpp
#	imgui_widgets.cpp

2021-12-01 15:37:40 +01:00

..

vulkan

…

imgui_impl_allegro5.cpp

Backends: Fixed early out on empty clip rect. In particular, DX12 backend would warn about it (others not so much). (#4775, #4464)

2021-11-30 21:48:29 +01:00

imgui_impl_allegro5.h

…

imgui_impl_android.cpp

…

imgui_impl_android.h

…

imgui_impl_dx9.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_dx9.h

…

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_dx10.h

…

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_dx11.h

…

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2021-10-06 17:57:11 +02:00

imgui_impl_glfw.cpp

Backends: Made it possible to shutdown default Platform Backends before the Renderer backends. (#4656)

2021-10-15 17:16:26 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking (will need further for io.AddFocusEvent)

2021-08-19 17:25:12 +02:00

imgui_impl_glut.cpp

…

imgui_impl_glut.h

…

imgui_impl_marmalade.cpp

…

imgui_impl_marmalade.h

…

imgui_impl_metal.h

…

imgui_impl_metal.mm

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_opengl2.h

…

imgui_impl_opengl3_loader.h

Backends: OpenGL3: Made our custom GL loader a bit more tolerant of use of another loader in same compilation unit. (#4445, #4514)

2021-09-07 14:48:26 +02:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2021-08-30 20:01:16 +02:00

imgui_impl_osx.h

…

imgui_impl_osx.mm

Merge branch 'master' into docking

2021-09-24 15:49:28 +02:00

imgui_impl_sdl.cpp

Backends: Made it possible to shutdown default Platform Backends before the Renderer backends. (#4656)

2021-10-15 17:16:26 +02:00

imgui_impl_sdl.h

Merge branch 'master' into docking

2021-09-24 15:49:28 +02:00

imgui_impl_sdlrenderer.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_sdlrenderer.h

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2021-12-01 15:37:40 +01:00

imgui_impl_vulkan.h

…

imgui_impl_wgpu.cpp

Backends: Fixed early out on empty clip rect. In particular, DX12 backend would warn about it (others not so much). (#4775, #4464)

2021-11-30 21:48:29 +01:00

imgui_impl_wgpu.h

…

imgui_impl_win32.cpp

Backends: Made it possible to shutdown default Platform Backends before the Renderer backends. (#4656)

2021-10-15 17:16:26 +02:00

imgui_impl_win32.h

…