 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
|
bc394410a2
|
Examples: Win32+DX9/DX10/DX11/DX12, SDL2+DX11/OpenGL2/OpenGL3/SDLRenderer/Vulkan, SDL3+OpenGL/SDLGPU/SDLRenderer/Vulkan: made example DPI aware by default. (master + docking: partial support for multi-dpi by scaling fonts + viewports but not style)
We don't bother with WIN32_LEAN_AND_MEAN.
# Conflicts:
# 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
|
2025-06-11 16:24:05 +02:00 |
|
|
ocornut
|
d72e66cdee
|
Examples: remove comments/references about baking and GetGlyphRangesJapanese().
|
2025-06-11 16:11:03 +02:00 |
|
|
ocornut
|
1c8fad73f8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2025-05-07 15:24:46 +02:00 |
|
 ocornut
|
46235e91f6
|
Examples: SDL3: specify SDL_WINDOW_HIGH_PIXEL_DENSITY and make centering consistent + call SDL_RenderScale().
|
2025-05-05 20:04:32 +02:00 |
|
|
ocornut
|
88d2df24be
|
Merge branch 'master' into docking
|
2025-04-16 20:31:18 +02:00 |
|
|
ocornut
|
b23a216ecd
|
Examples: added SDL2+Vulkan, SDL3+Vulkan, GLFW+Vulkan makefiles. Amend ignore list. (#2480)
|
2025-04-16 15:04:14 +02:00 |
|
|
ocornut
|
19d060cc26
|
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:
# imgui.cpp
|
2025-03-05 20:33:16 +01:00 |
|
|
ocornut
|
a7657f2ed4
|
Examples: SDL3: Added comments to clarify setup for users of the unfortunate SDL_MAIN_USE_CALLBACKS feature. (#8455)
|
2025-03-04 14:36:00 +01: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
|
64e738cae7
|
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:
# imgui.cpp
|
2025-01-22 12:19:09 +01:00 |
|
|
ocornut
|
d17e9fc107
|
Backends: SDL_GPU: shallow tweaks + disable anisotropy in sampler. Examples: SDL+Vulkan: Fixed incorrect defines.
|
2025-01-22 10:37:39 +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
|
9cc0bf89bd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
|
2025-01-06 17:59:22 +01:00 |
|
|
ocornut
|
a2e21727c0
|
Backends: Vulkan: moved helpers to backend: ImGui_ImplVulkanH_SelectPhysicalDevice(), ImGui_ImplVulkanH_SelectQueueFamilyIndex(). (#8180)
|
2025-01-06 17:35:20 +01:00 |
|
|
ocornut
|
646df39003
|
Examples: added SDL3+Vulkan example - enable multi-viewports. (#8084, #8085)
|
2024-10-24 18:18:42 +02:00 |
|
|
ocornut
|
ccb6646bae
|
Examples: added SDL3+Vulkan example. (#8084, #8085)
|
2024-10-24 18:09:27 +02:00 |
|