ocornut
|
a44d4da87c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
3 years ago |
|
ocornut
|
020d1ced1d
|
Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.
|
3 years ago |
|
ocornut
|
7fc144edde
|
Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.
|
3 years ago |
|
ocornut
|
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
|
3 years ago |
Basil Fierz
|
83bdfef8e0
|
Backends: WGPU: update to latest specs. (#4116, #3632)
Merged 13 commits.
|
3 years ago |
ITotalJustice
|
ea9122b0ac
|
Examples: add backends include path in readmes. (#4106)
|
3 years ago |
|
ocornut
|
34d4bc620d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
4 years ago |
duddel
|
05a20ca738
|
Examples: Android: Make Android build compatible with Gradle 7.0. (#3446)
|
4 years ago |
|
ocornut
|
b957300260
|
Documentation tweaks (#4042)
|
4 years ago |
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.
|
4 years ago |
Peter Kristensen
|
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 |
|
ocornut
|
6ddcdbe3e8
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
4 years ago |
|
ocornut
|
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 |
Nikolai Wuttke
|
c6c15a44fa
|
Examples: Add OpenGL ES 2.0 support to modern GL examples. (#2837, #3951)
|
4 years ago |
|
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
|
4 years ago |
|
ocornut
|
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 |
|
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
|
4 years ago |
|
ocornut
|
f1bf642e8f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
|
4 years ago |
|
ocornut
|
fdc2324d9a
|
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
|
4 years ago |
|
ocornut
|
80533ea5e1
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
4 years ago |
|
ocornut
|
8dd692c29c
|
Android: Amend backend and examples with minor consistency tweaks. (#3446)
|
4 years ago |
|
duddel
|
fb85c0341b
|
Add Android backend and example (#3446)
|
4 years ago |
|
ocornut
|
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 |
Xiliusha
|
eb57484935
|
Backends: DX9: add missing IMGUI_USE_BGRA_PACKED_COLOR support. Remove dinput.h headers. (#3844)
|
4 years ago |
|
Rokas Kupstys
|
3f5bb5939a
|
Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. (#2590)
|
4 years ago |
|
ocornut
|
9b32f7bf2d
|
Fix example_null Makefile for Mingw (#2590)
|
4 years ago |
|
ocornut
|
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 |
|
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
|
4 years ago |
|
ocornut
|
6a161b8789
|
Examples: Reworked setup of clear color to be compatible with transparent values. (#2693, #2764, #2766, #2873, #3447, #3813, #3816)
|
4 years ago |
|
ocornut
|
239d09804d
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
4 years ago |
|
ocornut
|
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 |
|
ocornut
|
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 |
|
ocornut
|
b898281e3c
|
Demo: Added 'Examples->Fullscreen Window' demo. (#3789) + repack and zero-clear ImDrawData.
|
4 years ago |
|
ocornut
|
577e7cb493
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
4 years ago |
|
ocornut
|
dff0044d4e
|
Backends, Examples: Added support for WebGPU and corresponding example. Amend 5853fbd (#3632)
|
4 years ago |
|
Basil Fierz
|
5853fbd68b
|
Backends, Examples: Added support for WebGPU and corresponding example (#3632)
(Squashed 11 commits)
|
4 years ago |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
4 years ago |
|
ocornut
|
feaa7ea003
|
Examples: Emscripten: Amend ba636c5. (#3705)
|
4 years ago |
Horki
|
0f14dd9781
|
Examples: Emscripten: Add 'make serve' helper, move output to web/ folder. (#3705)
|
4 years ago |
|
ocornut
|
b11518d7d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
4 years ago |
|
ocornut
|
7d5d5711c2
|
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., (#3671, #3668)
|
4 years ago |
|
ocornut
|
8ec5daf35d
|
Happy new year!
|
4 years ago |
|
ocornut
|
06e87014f2
|
Merge branch 'master' into docking
# Conflicts:
# imgui.h
# imgui_internal.h
|
4 years ago |
|
ocornut
|
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 |
|
ocornut
|
dd4ca70b0d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
4 years ago |
|
omar
|
9c8671e7b0
|
Tables: Add empty file, skeleton.
|
4 years ago |
|
ocornut
|
c1ffac2fee
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
4 years ago |
|
ocornut
|
d20f2bc90a
|
Rename example_emscripten/ to example_emscripten_opengl3/ (#3632)
|
4 years ago |
|
ocornut
|
b2a91dc390
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
4 years ago |
|
Rokas Kupstys
|
a3f79104df
|
Examples: Apple+Metal: Forward events to OS key combinations like CMD+Q can work. (#3554)
|
4 years ago |