edc2f15f5b
[v1.84.2] Merged from imgui/docking
3 years ago
5a7d18a441
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
3 years ago
d2ffbd9b86
Version 1.84
...
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
3 years ago
0b06c4b2b0
Merge branch 'master' into docking (will need further for io.AddFocusEvent)
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
3 years ago
e3988a84db
Backends: OpenGL3: Embed our own minimal GL loader (amends). ( #4445 )
3 years ago
459de65477
Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. ( #4445 )
...
Loader repository at https://github.com/dearimgui/gl3w_stripped
Removed support for using custom loaders in examples/opengl3 backend
3 years ago
f24abbc47d
Fix various warnings ( #4442 )
3 years ago
f9b5168fb3
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
3 years ago
923bd2fd21
Examples: DirectX12: Fixed Alt+Enter fullscreen in DirectX12 example. ( #4346 , #4348 )
...
This also removes unnecessary recreation of backend-owned device objects when the window is resized.
+ amend original PR with a g_pSwapChain->SetFullscreenState(false, NULL); call.
4 years ago
a11f36811f
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_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
4 years ago
6792e1a3e0
Backends: SDL2: Remove unnecessary ImGui_ImplSDL2_NewFrame() parameter. ( #3244 )
4 years ago
682447306d
Merge branch 'features/backends_context' 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_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# examples/example_apple_opengl2/main.mm
4 years ago
88f4c1321a
Examples: Bring code of example_apple_metal and example_apple_opengl2 closer to each other. ( #1873 , #3543 )
4 years ago
30224fdde0
Examples: example_apple_opengl2: Fix keys remaining stuck in pressed state when using shortcuts with CMD. ( #4253 )
...
Fix follows event capture scheme of example_apple_metal, where this issue is not present.
4 years ago
a44d4da87c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
4 years ago
020d1ced1d
Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.
4 years ago
7fc144edde
Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.
4 years ago
86c2b609ef
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_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
4 years ago
83bdfef8e0
Backends: WGPU: update to latest specs. ( #4116 , #3632 )
...
Merged 13 commits.
4 years ago
d08ca55bfe
ImGui now passes events on to main window
4 years ago
73b030146f
Updated Vulkan implementation to allocate descriptor sets from Hazel's renderer, and to generate font textures internally
4 years ago
ea9122b0ac
Examples: add backends include path in readmes. ( #4106 )
4 years ago
09c9a04f9f
Fixed some imgui scissor edge cases
4 years ago
34d4bc620d
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
4 years ago
05a20ca738
Examples: Android: Make Android build compatible with Gradle 7.0. ( #3446 )
4 years ago
60a35bfb25
Added ClearCache function to clear ImGui Vulkan texture cache on shutdown
4 years ago
b957300260
Documentation tweaks ( #4042 )
4 years ago
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.
4 years ago
5f45047fb6
Update example makefiles to check the new homebrew paths ( #4003 )
...
Homebrew on Apple Silicon (i.e. Macbook Air/Pro M1) use `/opt/homebrew` instead of /usr/local.
4 years ago
6ddcdbe3e8
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
4 years ago
2403ed92a3
Added build/ to gitignore ( #3027 ), Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [ #3988 , #3884 ] + added batch file for SDL+Vulkan.
4 years ago
c6c15a44fa
Examples: Add OpenGL ES 2.0 support to modern GL examples. ( #2837 , #3951 )
4 years ago
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
4 years ago
6f360d6040
Examples: Win32: using a more explicit loop for PeekMessage polling to make the code easier to copy and paste and less error-prone.
4 years ago
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
4 years ago
f1bf642e8f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
4 years ago
fdc2324d9a
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
4 years ago
80533ea5e1
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
4 years ago
8dd692c29c
Android: Amend backend and examples with minor consistency tweaks. ( #3446 )
4 years ago
fb85c0341b
Add Android backend and example ( #3446 )
4 years ago
6aee4bcdc5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
eb57484935
Backends: DX9: add missing IMGUI_USE_BGRA_PACKED_COLOR support. Remove dinput.h headers. ( #3844 )
4 years ago
53baeee26a
Added Vulkan texture support
4 years ago
3f5bb5939a
Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. ( #2590 )
4 years ago
9b32f7bf2d
Fix example_null Makefile for Mingw ( #2590 )
4 years ago
a4e4f57cb0
Examples: DX9-DX11: Removed half-assed DPI awareness enable. Updated Docking/Viewports part of Changelog (e.g. removed bits that are now already in master, clarified some added bits)
4 years ago
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
4 years ago
6a161b8789
Examples: Reworked setup of clear color to be compatible with transparent values. ( #2693 , #2764 , #2766 , #2873 , #3447 , #3813 , #3816 )
4 years ago
239d09804d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
4 years ago
647a308ad3
Backends: GLFW: Add ImGui_ImplGlfw_InitForOther() instead of ImGui_ImplGlfw_InitForWebGPU() so it can be used for e.g. DX11. ( #3632 )
...
Amend dff0044
4 years ago
TheCherno
ocornut
Rokas Kupstys
David Maas
Giovanni Funchal
Basil Fierz
ITotalJustice
duddel
Peter Kristensen
Nikolai Wuttke
Xiliusha