omar
|
8dc04a4c9f
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.h
# imgui_demo.cpp
|
5 years ago |
|
omar
|
c72040a715
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
5 years ago |
|
omar
|
2742663ad2
|
Changelog, minor tweaks. (#2585)
|
5 years ago |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
6 years ago |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
Omar Cornut
|
c3f9220c15
|
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
|
6 years ago |
Warren Moore
|
d64157e803
|
Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873)
|
6 years ago |
|
omar
|
deb7aa29cd
|
OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873)
|
6 years ago |
|
omar
|
fac0c801da
|
Examples: Added imgui_impl_osx.mm bindings (#1870, #281)
|
6 years ago |