ocornut
|
f1bf642e8f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
|
2021-03-11 16:32:14 +01:00 |
|
ocornut
|
fdc2324d9a
|
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
|
2021-03-11 16:21:46 +01: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
|
6a161b8789
|
Examples: Reworked setup of clear color to be compatible with transparent values. (#2693, #2764, #2766, #2873, #3447, #3813, #3816)
|
2021-02-18 11:38:41 +01:00 |
|
ocornut
|
dd4ca70b0d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
2020-12-04 19:22:15 +01:00 |
|
omar
|
9c8671e7b0
|
Tables: Add empty file, skeleton.
|
2020-12-04 19:15:19 +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
|
a7e21fb05f
|
Moving backends code from examples/ to backends/ (step 3: fixing project files)
|
2020-10-14 14:41:40 +02:00 |
|
ocornut
|
124c2608f1
|
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
|
2020-10-12 17:54:52 +02:00 |
|
omar
|
78f753ffff
|
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455, #3459)
|
2020-09-08 17:02:58 +02:00 |
|
omar
|
6461fd40ab
|
Examples: Fixed SDL+OpenGL2 and SDL+Vulkan examples not processing SDL_WINDOWEVENT_CLOSE events which tends to be needed in multi-viewport setting.
|
2020-09-07 12:23:26 +02:00 |
|
Michel Lesoinne
|
b25756be4a
|
Examples: Vulkan: Switch validation layer. Fix CMakeLists to find Vulkan the standard way. (#3459)
|
2020-09-07 11:43:57 +02:00 |
|
ocornut
|
36c331ff74
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
# imgui_internal.h
|
2020-09-02 12:47:07 +02:00 |
|
ocornut
|
b73305be11
|
Examples: Vulkan: Reworked buffer resize handling, amend df89a16d (#3390, #2626)
|
2020-09-02 12:43:23 +02:00 |
|
ocornut
|
e9053515bb
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
|
2020-08-25 19:29:06 +02:00 |
|
ocornut
|
df89a16d26
|
Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. (#3390, #2626)
|
2020-08-21 15:29:57 +02:00 |
|
omar
|
209a6a751c
|
Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
This reverts commit a24578ec09.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
|
2020-08-10 11:33:59 +02:00 |
|
ocornut
|
ede8825fb2
|
Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 (#3390)
|
2020-08-07 15:24:00 +02:00 |
|
omar
|
a24578ec09
|
Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)
|
2020-08-05 15:02:30 +02:00 |
|
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
ocornut
|
5d472c4895
|
Merge branch 'master' into docking + fixes for #3259
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2020-05-25 18:32:15 +02:00 |
|
ocornut
|
a06eb83359
|
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
|
2020-05-25 18:15:59 +02:00 |
|
ocornut
|
a056603d8b
|
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
|
2020-05-25 12:12:02 +02:00 |
|
ocornut
|
fbaf65b8f6
|
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200.
|
2020-03-06 17:53:09 +01:00 |
|
ocornut
|
f2c7f3b200
|
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)
|
2020-03-06 17:28:32 +01:00 |
|
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
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
2019-11-25 18:29:28 +01:00 |
|
Rokas Kupstys
|
6892b81578
|
Remove trailing spaces from bunch of files.
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
|
2019-10-15 16:04:02 +02:00 |
|
omar
|
575df6f192
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
|
2019-09-17 16:35:50 +02:00 |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
2019-06-18 11:28:26 +02:00 |
|
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.
|
2019-06-06 16:13:30 +02:00 |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
2019-04-25 17:53:11 +02:00 |
|
omar
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
2019-04-23 12:38:59 +02:00 |
|
David Amador
|
994a92d79d
|
Added support to use controllers via SDL_GameController. (#2509)
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
|
2019-04-23 12:14:05 +02:00 |
|
omar
|
f159eb35fb
|
Examples: SDL: Removed unused code. (#2484)
|
2019-04-22 10:43:14 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
35cbf9c052
|
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
1295205cd4
|
Examples: Vulkan: Fixed warnings. (#2480)
|
2019-04-07 22:27:45 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
c43dab2414
|
Vulkan: Fix not incrementing semaphore index. (#2472, #2071)
|
2019-04-07 15:57:07 +02:00 |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
2019-04-05 20:27:46 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|
MindSpunk
|
a45840746e
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 17:04:12 +02:00 |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
2019-04-04 23:40:28 +02:00 |
|
omar
|
4f54a527ab
|
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071)
|
2019-04-04 23:13:31 +02:00 |
|