ocornut 773060155f Merge branch 'master' into docking ...

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

2025-02-21 19:56:20 +01:00

..

sdlgpu3

Backends: SDLGPU3: Added sdl_gpu backend (amends). (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

vulkan

Backends: SDLGPU3: Added sdl_gpu backend (amends). (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_android.cpp

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_android.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_dx9.cpp

Merge branch 'master' into docking

2025-01-08 14:36:14 +01:00

imgui_impl_dx9.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2025-01-15 17:34:17 +01:00

imgui_impl_dx10.h

Merge branch 'master' into docking

2025-01-08 14:36:14 +01:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2025-01-08 14:36:14 +01:00

imgui_impl_dx11.h

Merge branch 'master' into docking

2025-01-08 14:36:14 +01:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2025-01-15 17:34:17 +01:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2025-01-08 14:36:14 +01:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_glfw.h

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_glut.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_glut.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_metal.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2025-02-03 18:42:24 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2025-01-15 17:34:17 +01:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_opengl3_loader.h

Backends: DX9, DX10, DX11, DX12, OpenGL, Vulkan, WGPU: Changed default texture sampler to Clamp instead of Repeat/Wrap. (#7468, #7511, #5999, #5502)

2024-10-07 22:02:55 +02:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_osx.h

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_osx.mm

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_sdl2.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2025-01-20 18:04:31 +01:00

imgui_impl_sdlgpu3_shaders.h

Backends: SDLGPU3: Added sdl_gpu backend. (#8163, #7998, #7988)

2025-01-09 16:55:03 +01:00

imgui_impl_sdlgpu3.cpp

Merge branch 'master' into docking

2025-01-22 12:19:09 +01:00

imgui_impl_sdlgpu3.h

Merge branch 'master' into docking

2025-01-20 18:04:31 +01:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2025-01-20 18:04:31 +01:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2025-01-20 18:04:31 +01:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2025-02-17 11:46:16 +01:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2025-02-17 11:46:16 +01:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2025-02-21 19:56:20 +01:00

imgui_impl_win32.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00