ocornut
|
3e0d6ec895
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
3 years ago |
|
ocornut
|
ceb26bac48
|
Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914)
|
3 years ago |
|
ocornut
|
1780579403
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
3 years ago |
|
ocornut
|
677fe33990
|
Backends: DX12: use dxgiformat.h to fix using forward declared DXGI_FORMAT (#4594)
|
3 years ago |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
3 years ago |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
3 years ago |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
4 years ago |
|
ocornut
|
36535514d5
|
Backends: DX12: Fix warning (#3706). Disable obsolete Tables enums, leave them commented out. Using _MSVC_LANG to enable offsetof() and static_assert() on VS2015.3+
|
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
|
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 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
4 years ago |
|
ocornut
|
a7e21fb05f
|
Moving backends code from examples/ to backends/ (step 3: fixing project files)
|
4 years ago |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
4 years ago |