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
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
7a516a266d
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
4 years ago
b898281e3c
Demo: Added 'Examples->Fullscreen Window' demo. ( #3789 ) + repack and zero-clear ImDrawData.
4 years ago
577e7cb493
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
dff0044d4e
Backends, Examples: Added support for WebGPU and corresponding example. Amend 5853fbd ( #3632 )
4 years ago
5853fbd68b
Backends, Examples: Added support for WebGPU and corresponding example ( #3632 )
...
(Squashed 11 commits)
4 years ago
388ca563db
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
4 years ago
feaa7ea003
Examples: Emscripten: Amend ba636c5. ( #3705 )
4 years ago
0f14dd9781
Examples: Emscripten: Add 'make serve' helper, move output to web/ folder. ( #3705 )
4 years ago
b11518d7d7
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
4 years ago
7d5d5711c2
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., ( #3671 , #3668 )
4 years ago
8ec5daf35d
Happy new year!
4 years ago
06e87014f2
Merge branch 'master' into docking
...
# Conflicts:
# imgui.h
# imgui_internal.h
4 years ago
3346544cf5
Examples: Fix batch files (amend b1a18d82, #3513 ), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe.
4 years ago
dd4ca70b0d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
4 years ago
9c8671e7b0
Tables: Add empty file, skeleton.
4 years ago
c1ffac2fee
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
4 years ago
d20f2bc90a
Rename example_emscripten/ to example_emscripten_opengl3/ ( #3632 )
4 years ago
b2a91dc390
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
4 years ago
a3f79104df
Examples: Apple+Metal: Forward events to OS key combinations like CMD+Q can work. ( #3554 )
4 years ago
ac08593b96
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
4 years ago
5f97809cab
Misc tidying up (zero-clear structures, more unused default in ClipRetFullscreen, NavApplyItemToResult() coding style fix)
...
Zero-clearing more structures
Remove arbitrary default ClipRetFullscreen value in ImDrawListSharedData.
Nav extracted NavApplyItemToResult() function.
Coding style fixes in OSX Backends.
4 years ago
e3ac52630a
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
4 years ago
bca4749346
Examples: Apple: Consolidated example_apple_metal to reduce class and file count ( #1873 , #3543 )
4 years ago
acb8ef2006
Examples: Vulkan: Fixed CMake include path. ( #3550 )
...
The backends directory was not included, so the build was failing.
4 years ago
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
4 years ago
b1a18d82e3
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
4 years ago
a2a3d80f04
Moving backends code from examples/ to backends/ (step 5: move documentation to MD files)
4 years ago
a2d845f9dd
Moving backends code from examples/ to backends/ (step 4: update documentation, much improvement)
4 years ago
a7e21fb05f
Moving backends code from examples/ to backends/ (step 3: fixing project files)
4 years ago
428f4fce70
Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)
4 years ago
d9b2fb7338
Moving backends code from examples/ to backends/ (step 1: moving source files)
4 years ago
124c2608f1
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
4 years ago
0f13fdd177
Removed redirecting functions/enums names that were marked obsolete in 1.60: io.RenderDrawListsFn, IsAnyWindowFocused(), IsAnyWindowHovered(), etc.
4 years ago
ocornut
duddel
Xiliusha
Rokas Kupstys
Basil Fierz
Horki
Warren Moore
Bill Six