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

# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui_demo.cpp

2023-04-06 19:16:08 +02:00

..

vulkan

…

imgui_impl_allegro5.cpp

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_allegro5.h

…

imgui_impl_android.cpp

…

imgui_impl_android.h

…

imgui_impl_dx9.cpp

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx9.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx10.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx11.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_dx12.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00

imgui_impl_glut.cpp

Backends: OSX: Fixed scroll wheel scaling for devices emitting events with hasPreciseScrollingDeltas==false (e.g. non-Apple mices).

2023-02-01 19:43:03 +01:00

imgui_impl_glut.h

Backends: OSX: Fixed scroll wheel scaling for devices emitting events with hasPreciseScrollingDeltas==false (e.g. non-Apple mices).

2023-02-01 19:43:03 +01:00

imgui_impl_metal.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_metal.mm

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2023-03-29 18:41:41 +02:00

imgui_impl_opengl2.h

…

imgui_impl_opengl3_loader.h

Backend: OpenGL3: Amend b0c18166 fix cases where glGetString(GL_VERSION) returns NULL. (#6154, #4445, #3530)

2023-03-15 12:25:34 +01:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2023-03-29 18:41:41 +02:00

imgui_impl_opengl3.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_osx.h

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_osx.mm

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2023-04-06 19:16:08 +02:00

imgui_impl_sdl2.h

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2023-04-06 19:16:08 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00

imgui_impl_sdlrenderer.cpp

Merge branch 'master' into docking

2023-03-29 18:41:41 +02:00

imgui_impl_sdlrenderer.h

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_vulkan.h

Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)

2023-02-07 16:23:49 +01:00

imgui_impl_wgpu.cpp

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_wgpu.h

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01:00

imgui_impl_win32.cpp

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497

2023-04-04 21:17:47 +02:00