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

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_widgets.cpp

2023-02-07 16:23:49 +01: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 misc changes from docking branch to reduce small drift.

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

imgui_impl_allegro5.h

Backends: Allegro5: Update to use io.AddEventKey() will full key map (#2625, #4858)

2022-01-10 15:13:36 +01:00

imgui_impl_android.cpp

Renamed and merged keyboard modifiers key enums and flags into a same set:. ImGuiKey_ModXXX -> ImGuiMod_XXX and ImGuiModFlags_XXX -> ImGuiMod_XXX. (#4921, #456)

2022-09-26 10:43:26 +02:00

imgui_impl_android.h

Backends: Android: Update to use io.AddEventKey() will full key map (#2625, #4858)

2022-01-10 15:15:24 +01:00

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 (doesn't include viewports-related changes for new SDL3 backend)

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

imgui_impl_glfw.h

Merge branch 'master' into docking (incl revert of examples refactor)

2023-02-03 22:38:39 +01: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-01-03 21:06:09 +01:00

imgui_impl_opengl2.h

Backends: OSX, Metal: Amend d111133, tidying up, remove unused, misc tweaks. . (#4821, #2778)

2022-05-03 18:14:10 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL: Update comments. (#4445, #5642, #4649)

2022-09-05 15:58:31 +02:00

imgui_impl_opengl3.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_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 (doesn't include viewports-related changes for new SDL3 backend)

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

imgui_impl_sdl2.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_sdl3.cpp

Backends: SDL3: update to run with SDL3. Examples: Add SDL3+Gl example. Remove some version checks. (#6146)

2023-02-07 16:07:53 +01:00

imgui_impl_sdl3.h

Backends: SDL3: update to run with SDL3. Examples: Add SDL3+Gl example. Remove some version checks. (#6146)

2023-02-07 16:07:53 +01:00

imgui_impl_sdlrenderer.cpp

Merge misc changes from docking branch to reduce small drift.

2023-02-07 13:22:23 +01: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 misc changes from docking branch to reduce small drift.

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

imgui_impl_win32.h

Merge branch 'master' into docking

2022-12-01 20:22:27 +01:00