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 |
|
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
|
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 |