ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
30594c37d0
|
Merge branch 'master' into docking
|
2023-08-01 10:22:21 +02:00 |
|
Sascha Willems
|
fa2f1bfbb0
|
Examples: Vulkan: Fixed Vulkan descriptor pools. (#6642)
Only use required no. of types and sets
|
2023-07-29 17:01:27 +02:00 |
|
ocornut
|
594cc4793a
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2023-04-25 12:21:16 +02:00 |
|
kimidaisuki22
|
565aa0b763
|
Examples: Vulkan: pick integrated GPU if nothing else is available. (#6359)
|
2023-04-24 12:17:49 +02:00 |
|
ocornut
|
0ea3b87bd6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
|
2023-04-13 16:24:09 +02:00 |
|
ocornut
|
ba98667c65
|
Examples: Vulkan: further work for device extensions + tentative use o fVK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME. (#6109, #6172, #6101)
|
2023-04-13 16:08:51 +02:00 |
|
ocornut
|
6324280432
|
Examples: Vulkan: rework extensions setup + enable some to avoid validation layer errors. (#6109, #6172, #6101)
Enable VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
|
2023-04-13 15:48:19 +02:00 |
|
ocornut
|
aec062a8a5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# examples/example_win32_directx9/main.cpp
# imgui_internal.h
|
2023-04-11 16:16:17 +02:00 |
|
Michael Martz
|
506f7e0074
|
Using nullptr in locations where warning disable is not convenient. (#6313, #4537)
|
2023-04-11 11:33:50 +02:00 |
|
ocornut
|
9937660b1c
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_apple_metal/main.mm
# examples/example_apple_opengl2/main.mm
# examples/example_glfw_metal/main.mm
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl2_directx11/main.cpp
# examples/example_sdl2_metal/main.mm
# 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_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
2023-03-10 18:40:04 +01:00 |
|
ocornut
|
bb224c8aa1
|
Examples: Updated all examples application to enable ImGuiConfigFlags_NavEnableKeyboard and ImGuiConfigFlags_NavEnableGamepad by default.
|
2023-03-10 18:35:52 +01:00 |
|
ocornut
|
b0a936e5d4
|
Merge branch 'master' into docking (incl revert of examples refactor)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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
|
2023-02-03 22:38:39 +01:00 |
|
ocornut
|
f43c6ea6a4
|
Revert most of "Examples: refactor all examples with a MainLoopStep() function..." (#2492, #3699)"
This reverts commit 96ab68eee0.
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
|
2023-02-03 22:17:40 +01:00 |
|
ocornut
|
5386ddcd05
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# examples/example_emscripten_opengl3/main.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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_demo.cpp
|
2023-02-02 18:31:26 +01:00 |
|
ocornut
|
96ab68eee0
|
Examples: refactor all examples with a MainLoopStep() function, to facilitate use with Emscripten. (#2492, #3699)
Aligned all examples.
|
2023-02-02 17:30:48 +01:00 |
|
ocornut
|
1dc7d0e633
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2022-09-26 11:08:49 +02:00 |
|
ocornut
|
5c8041b4d7
|
Update gif in README + font names in examples
|
2022-09-19 17:45:05 +02:00 |
|
ocornut
|
3af9ac320d
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2022-09-17 00:25:42 +02:00 |
|
tocic
|
2b1d8e3eaf
|
Fix more typos in sources and docs (#5681)
|
2022-09-14 20:36:45 +02:00 |
|
ocornut
|
21fc57f2cf
|
Merge branch 'master' into docking
|
2022-07-08 16:09:30 +02:00 |
|
ocornut
|
92d0924b82
|
Fixed build with IMGUI_DISABLE_OBSOLETE_KEYIO + made all examples comments refer to StyleColorsLight().
|
2022-07-06 20:58:20 +02:00 |
|
ocornut
|
377b864bb4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2022-03-23 17:21:34 +01:00 |
|
ocornut
|
1e18da5c38
|
Backends, Examples: Add comments about using WndProc handler and WantCaptureXXX flags. (#5061)
+ update README.
|
2022-02-28 20:51:50 +01:00 |
|
ocornut
|
8567a4cca3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2022-01-17 18:19:20 +01:00 |
|
ocornut
|
6188e94108
|
Examples: Vulkan: fill Subpass and MSAASamples to increase discoverability (#4886) + IO docs update (#4858)
https://github.com/mosra/magnum-integration/pull/89
|
2022-01-14 11:51:59 +01:00 |
|
ocornut
|
34d4bc620d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2021-04-15 19:57:52 +02:00 |
|
Rokas Kupstys
|
bcdc8bcc4b
|
Examples: Vulkan: Update GPU selection to pick discrete GPU if available, or use first GPU otherwise. (#4012)
Fixes examples failing on optimus laptops with integrated graphics not supporting Vulkan.
|
2021-04-07 14:39:01 +02:00 |
|
ocornut
|
e7577d570e
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2021-03-25 16:57:01 +01:00 |
|
ocornut
|
6e4770ea5c
|
Examples: Vulkan: Rebuild swapchain on VK_SUBOPTIMAL_KHR. (#3881)
Ref https://vulkan-tutorial.com/Drawing_a_triangle/Swap_chain_recreation#page_Suboptimal-or-out-of-date-swap-chain
|
2021-03-18 18:12:52 +01:00 |
|
ocornut
|
ffa863a3ba
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
|
2021-02-18 11:41:27 +01:00 |
|
ocornut
|
6a161b8789
|
Examples: Reworked setup of clear color to be compatible with transparent values. (#2693, #2764, #2766, #2873, #3447, #3813, #3816)
|
2021-02-18 11:38:41 +01:00 |
|
ocornut
|
042a3b01d2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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
|
2020-10-14 14:44:03 +02:00 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
2020-10-14 14:42:00 +02:00 |
|
ocornut
|
124c2608f1
|
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
|
2020-10-12 17:54:52 +02:00 |
|
omar
|
78f753ffff
|
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455, #3459)
|
2020-09-08 17:02:58 +02:00 |
|
Michel Lesoinne
|
b25756be4a
|
Examples: Vulkan: Switch validation layer. Fix CMakeLists to find Vulkan the standard way. (#3459)
|
2020-09-07 11:43:57 +02:00 |
|
ocornut
|
36c331ff74
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
# imgui_internal.h
|
2020-09-02 12:47:07 +02:00 |
|
ocornut
|
b73305be11
|
Examples: Vulkan: Reworked buffer resize handling, amend df89a16d (#3390, #2626)
|
2020-09-02 12:43:23 +02:00 |
|
ocornut
|
e9053515bb
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
|
2020-08-25 19:29:06 +02:00 |
|
ocornut
|
df89a16d26
|
Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. (#3390, #2626)
|
2020-08-21 15:29:57 +02:00 |
|
ocornut
|
ede8825fb2
|
Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 (#3390)
|
2020-08-07 15:24:00 +02:00 |
|
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
ocornut
|
5d472c4895
|
Merge branch 'master' into docking + fixes for #3259
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2020-05-25 18:32:15 +02:00 |
|
ocornut
|
a06eb83359
|
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
|
2020-05-25 18:15:59 +02:00 |
|
ocornut
|
a056603d8b
|
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
|
2020-05-25 12:12:02 +02:00 |
|
ocornut
|
fbaf65b8f6
|
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200.
|
2020-03-06 17:53:09 +01:00 |
|
ocornut
|
f2c7f3b200
|
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)
|
2020-03-06 17:28:32 +01:00 |
|