ocornut
|
05bc204dbd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
|
4 years ago |
ocornut
|
95c99aaa4b
|
Version 1.78
|
4 years ago |
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
5 years ago |
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
5 years ago |
omar
|
b8e2b2bd6b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
5 years ago |
SergeyN
|
977ac53dd8
|
Examples: Win32+DX12: Fixed resizing main window, enabled debug layer. (#3087, #3115)
|
5 years ago |
ocornut
|
fbaf65b8f6
|
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200 .
|
5 years ago |
ocornut
|
f2c7f3b200
|
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)
|
5 years ago |
Omar
|
bb1e6f8af6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
5 years ago |
Omar
|
8601187fee
|
Backends: Win32: Clarify how the WndProc handler requires a forward declaration.
|
5 years ago |
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
5 years ago |
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
5 years ago |
omar
|
0cbb96895a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
|
5 years ago |
omar
|
6ffee0e75e
|
Backends: DX12: Added extra ID3D12DescriptorHeap parameter to ImGui_ImplDX12_Init() function. The value is unused in master branch but will be used by the multi-viewport features (docking branch). (#2851)
+ Using SafeRelease() in master.
|
5 years ago |
Ilya.Sevrikov
|
05c1f2795a
|
Add multi-viewports for DX12. (#2851)
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
|
5 years ago |
omar
|
eedc8f993f
|
Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled.
|
5 years ago |
omar
|
63310acd58
|
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
|
6 years ago |
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
6 years ago |
omar
|
a26085ed53
|
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
|
6 years ago |
omar
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
6 years ago |
omar
|
6767b0a1b0
|
Examples: Win32+DirectX: moved helper functions below main.
|
6 years ago |
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
6 years ago |
omar
|
f94af2f5c5
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
|
6 years ago |
omar
|
8079344cee
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
6 years ago |
omar
|
82e31d34f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
|
6 years ago |
omar
|
295ada0364
|
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
|
6 years ago |
omar
|
b5144e477f
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
6 years ago |
omar
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
6 years ago |
omar
|
882f1bc135
|
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
|
6 years ago |
omar
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
omar
|
ee5560a958
|
Merge branch 'master' into viewport + added style tweak block when viewports are enabled
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
|
6 years ago |
omar
|
d5b22fb635
|
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
|
6 years ago |
omar
|
3c114b280a
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
|
6 years ago |
omar
|
19c4fa8dd5
|
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
|
6 years ago |
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
6 years ago |
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
6 years ago |
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
6 years ago |
omar
|
fda57f48d5
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/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
|
6 years ago |
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
6 years ago |
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
6 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
|
a82be53407
|
Merge branch 'docking2' into viewport_docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/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
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
omar
|
49533bc86e
|
Examples: Enabled Docking + Nav by default in the branch. (#351)
|
6 years ago |
omar
|
e312363007
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
6 years ago |
omar
|
01586d33f3
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
6 years ago |
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
7 years ago |
omar
|
ff83d0e369
|
Examples: Using fully qualified "Dear ImGui" name in window titles.
|
7 years ago |
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
7 years ago |