 ocornut
|
f4a3529ffc
|
Fixed bad merge which left a few examples not building in docking branch.
|
2025-09-17 19:00:27 +02:00 |
|
|
ocornut
|
34bff4672c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# examples/example_glfw_metal/main.mm
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_win32_opengl3/main.cpp
# examples/example_win32_vulkan/main.cpp
# imgui.h
|
2025-09-17 18:48:39 +02:00 |
|
|
ocornut
|
3c6c5692b8
|
Examples: Win32+Vulkan, GLFW+Metal: Fixed not applying content scale. (#8921, #8756)
Somehow it breaks in Win32+OpenGL3 example: when enabled Win32 applies some extra scale.
|
2025-09-15 16:50:58 +02:00 |
|
|
ocornut
|
4d216d4510
|
Merge branch 'master' into docking
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
# Conflicts:
# backends/imgui_impl_sdlgpu3.cpp
|
2025-08-27 18:57:56 +02:00 |
|
|
ocornut
|
fe03035112
|
Docs: advertise ProggyVector font as an alternative.
|
2025-08-20 20:02:49 +02:00 |
|
|
ocornut
|
6af6cec23f
|
Merge branch 'master_fonts' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl2.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_sdlgpu3.h
# backends/imgui_impl_vulkan.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl2_directx11/main.cpp
# examples/example_sdl2_opengl2/main.cpp
# examples/example_sdl2_opengl3/main.cpp
# examples/example_sdl2_vulkan/main.cpp
# examples/example_sdl3_opengl3/main.cpp
# examples/example_sdl3_sdlgpu3/main.cpp
# examples/example_sdl3_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2025-06-11 18:07:19 +02:00 |
|
|
ocornut
|
c18301f356
|
Examples: remove explicit font sizes from AddFontXXX() calls. Add commented out style.FontSizeBase assignment.
|
2025-06-11 16:25:03 +02:00 |
|
|
ocornut
|
d72e66cdee
|
Examples: remove comments/references about baking and GetGlyphRangesJapanese().
|
2025-06-11 16:11:03 +02:00 |
|
|
ocornut
|
afd659bb92
|
Merge branch 'master' into docking
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_vulkan.cpp
|
2025-02-17 11:46:16 +01:00 |
|
|
ocornut
|
12963f5231
|
Examples: Vulkan: make ApiVersion a little more visible in examples. (#8326, #8365)
|
2025-02-13 15:49:47 +01:00 |
|
|
ocornut
|
015186aaf8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_vulkan.cpp
|
2025-01-15 17:34:17 +01:00 |
|
|
ocornut
|
0f33d7185f
|
Examples: Vulkan: vkAcquireNextImageKHR() and vkQueuePresentKHR() returning VK_SUBOPTIMAL_KHR keeps moving forward. (#7825, #7831)
|
2025-01-15 17:31:38 +01:00 |
|
|
ocornut
|
d0d571e0d7
|
Merge branch 'master' into docking
build / Windows (push) Waiting to run
build / Linux (push) Waiting to run
build / MacOS (push) Waiting to run
build / iOS (push) Waiting to run
build / Emscripten (push) Waiting to run
build / Android (push) Waiting to run
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
|
2025-01-13 14:30:57 +01:00 |
|
|
ocornut
|
0b8ff4b238
|
Backends, Examples: Vulkan: add IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE. use in descriptor pools sizes. (#6642)
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
|
2025-01-09 23:29:44 +01:00 |
|
|
ocornut
|
3cdf3f9411
|
Examples: Add Win32+Vulkan example: add multi-viewport support. (#8180)
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
|
2025-01-06 18:10:01 +01:00 |
|
|
ocornut
|
93a93071a2
|
Examples: Add Win32+Vulkan example, amends. (#8180)
|
2025-01-06 17:58:37 +01:00 |
|
 Jovan Ristic
|
38e606a153
|
Examples: Add Win32+Vulkan example. (#8180)
|
2025-01-06 17:40:11 +01:00 |
|