ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2021-06-04 17:28:45 +02:00 |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
2021-05-27 13:59:35 +02:00 |
|
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
|
2021-05-19 19:05:01 +02:00 |
|
thedmd
|
3c72e5142b
|
Backends: Replace direct access to TextureId with GetTexID() call in ImDrawCmd. (#3761)
|
2021-05-19 18:39:18 +02:00 |
|
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
|
2021-02-18 11:41:27 +01:00 |
|
ocornut
|
bda12e5fdd
|
Backends: Rework blending equation to preserve alpha in output buffer accross all backends. (#2693, #2764, #2766, #2873, #3447, #3813, #3816)
Some of the viewport ideas from #2766 are not in there yet (e.g. Vulkan: setting compositeAlpha based on cap.supportedCompositeAlpha)
|
2021-02-18 11:38:41 +01:00 |
|
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
|
2021-02-09 13:17:24 +01:00 |
|
ocornut
|
58a0a7058c
|
Backends: Using SetTexID() consistently instead of assigning to ->TexID. May make the later obsolete eventually.
|
2021-02-03 18:30:26 +01:00 |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
2021-01-15 19:20:42 +01:00 |
|
ocornut
|
b11518d7d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2021-01-05 16:46:38 +01:00 |
|
ocornut
|
9bcf77eb81
|
Fixed using IsItemEdited() after Combo() not matching the return value from Combo(). (#2034) + fix some PVS warnings, fix typo, blanks.
Amend e28b1078
|
2021-01-04 19:15:20 +01:00 |
|
ocornut
|
7d5d5711c2
|
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., (#3671, #3668)
|
2021-01-03 17:01:54 +01:00 |
|
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
|
2020-10-14 14:44:03 +02:00 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
2020-10-14 14:42:00 +02:00 |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
2020-10-14 14:41:40 +02:00 |
|