ocornut
fa004ae79a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_examples.sln
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
# imgui_widgets.cpp
2020-09-22 17:00:57 +02:00
ocornut
825f699bde
Backends: OpenGL3: Amends ( #3467 , #1985 )
2020-09-17 09:55:58 +02:00
Sven Balzer
42575d4a99
Viewports, Backends: Win32: Fix toggling of ImGuiViewportFlags_TopMost ( #3477 )
2020-09-17 09:47:04 +02:00
Julian Webb
2460f2abe3
Backends: OpenGL3: Fix to avoid calling glBindSampler() with version <= 3.2 ( #3467 , #1985 )
...
(nb: GLEW sets the define we previously used)
2020-09-17 09:34:11 +02:00
omar
e230ec5a01
Viewports, Backends: DX12: Make secondary viewport format match main viewport one ( #3462 ) {@BeastLe9enD]
2020-09-16 11:05:02 +02:00
Pierre-Loup Pagniez
a1597cff08
Backends: DX12: Fix D3D12 Debug Layer warning if scissor rect is 0 width or 0 height. ( #3472 , #3462 )
...
In the event where the scissor rect is 0 width or 0 height, don't call Draw, as it generates warnings if the D3D12 Debug Layer is enabled, and nothing would have been drawn anyway.
2020-09-16 10:43:17 +02:00
omar
a8f409a848
Examples: DX12: Enable breaking on any warning/error when debug interface is enabled. ( #3462 , #3472 ) + misc comments & minor fixes.
2020-09-16 10:40:06 +02:00
omar
770c995365
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2
. ( #3459 ) + Add ImGui_ImplVulkanH_CreateWindowSwapChain in ImGui_ImplVulkanH_CreateOrResizeWindow().
2020-09-08 22:44:24 +02:00
omar
e8447dea45
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2
. ( #3459 )
2020-09-08 22:39:53 +02:00
omar
d8d58b038e
Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. ( #301 )
2020-09-08 20:03:34 +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
41e2aa2e7a
Backends: Vulkan: Separate the pipeline of the dear imgui created windows from the one created with the user's render-pass. ( #3455 , #3459 )
...
This is mostly for the benefit of multi-viewports.
2020-09-08 16:54:48 +02:00
omar
6461fd40ab
Examples: Fixed SDL+OpenGL2 and SDL+Vulkan examples not processing SDL_WINDOWEVENT_CLOSE events which tends to be needed in multi-viewport setting.
2020-09-07 12:23:26 +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
Doug Binks
aa8e09d7f1
Backends: GLFW: workaround for cases where glfwGetMonitorWorkarea fails ( #3457 )
2020-09-07 10:49:34 +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
d6f3a8848d
Viewports: Backends: DirectX9: Allow D3DERR_DEVICELOST on secondary viewports. ( #3424 )
2020-08-21 15:02:52 +02:00
ocornut
ad8fdc917f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-08-20 22:42:14 +02:00
ocornut
9262609eaf
Version 1.79 WIP
2020-08-20 16:46:44 +02:00
ocornut
024993adf9
Revert leftovers from 4c201994d4
2020-08-20 11:25:05 +02:00
ocornut
4c201994d4
DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. ( #3361 )
2020-08-20 11:21:15 +02:00
ocornut
05bc204dbd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
2020-08-18 17:51:43 +02:00
ocornut
95c99aaa4b
Version 1.78
2020-08-18 17:50:45 +02:00
omar
14539b3ed2
Update Emscripten readme about emrun ( #3412 )
2020-08-18 12:34:19 +02:00
omar
d3fcc37e9e
Update Emscripten readme about local XHR requests ( #3412 )
2020-08-18 12:27:40 +02:00
ocornut
25a9209b75
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2020-08-17 23:29:17 +02:00
omar
009276b6cb
Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads ( #3394 , #2424 , #1463 ) [@nobody-special666]
...
Amend 7dea158175
+ Fix vsproj GUID
2020-08-10 15:31:48 +02:00
omar
2c13a74a9d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
2020-08-10 11:35:51 +02:00
omar
209a6a751c
Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
...
This reverts commit a24578ec09
.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
2020-08-10 11:33:59 +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
omar
a24578ec09
Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)
2020-08-05 15:02:30 +02:00
omar
963839373c
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
2020-08-03 21:31:42 +02:00
Rokas Kupstys
3d4af15d1d
Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available.
2020-07-17 18:44:09 +02:00
omar
cba52b66af
Backends: GLFW: Fixed enabling ImGuiBackendFlags_HasMouseHoveredViewport broken by 950539b7
.
...
As it turns out, back-end passing NULL hovered with HasMouseHoveredViewport is also broken which defeats some of its purpose.
2020-07-17 18:14:04 +02:00
omar
f79f0e42f7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
2020-07-14 18:38:47 +02:00
omar
fb7f6cab8c
Backends: Amend, docs + extra comments. ( #3330 , #3245 )
2020-07-10 14:36:00 +02:00
Moritz Heinemann
06f7854b16
Backends: OpenGL3: Add glad 2 to OpenGL loaders. ( #3330 )
2020-07-10 14:34:25 +02:00
omar
b626dd57d3
Backends: DX12, Viewports: Tidying up, renaming.
2020-07-10 12:20:03 +02:00
omar
cb1d578470
Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. ( #3347 )
2020-07-10 12:09:24 +02:00
omar
ab4ef822f0
Version 1.78 WIP
2020-06-30 16:56:09 +02:00
omar
90ea7e2f2f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-06-30 16:43:16 +02:00
Rokas Kupstys
0738611559
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
2020-06-30 16:37:21 +02:00
omar
ddabfc3477
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-06-29 17:15:40 +02:00
omar
9418dcb693
Version 1.77
...
+ fix minor clang-tidy warnings which seems reasonable
2020-06-29 15:54:28 +02:00
omar
20d61f5f62
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-20 22:06:01 +02:00
omar
99f68d7958
Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
2020-06-19 11:34:04 +02:00
ocornut
2665288b30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-11 11:36:38 +02:00