omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
788febf044
|
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097)
|
2018-09-24 10:13:01 +02:00 |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
2018-09-20 10:31:23 +02:00 |
|
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
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
2018-09-13 16:50:13 +02:00 |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|
MindSpunk
|
7eadcf7d7d
|
example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)
|
2018-09-09 21:09:58 +02:00 |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
omar
|
4dea0327e7
|
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
|
2018-08-25 21:16:08 +02:00 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
ff83d0e369
|
Examples: Using fully qualified "Dear ImGui" name in window titles.
|
2018-07-23 17:31:13 +02:00 |
|
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
2018-07-16 22:25:36 +02:00 |
|
omar
|
73e13a0762
|
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
|
2018-07-16 22:17:34 +02:00 |
|
omar
|
770cba0bd0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
|
2018-07-02 20:13:16 +02:00 |
|
codecnotsupported
|
b62cc5c150
|
Fix include Example_glfw_vulkan cmake (#1916)
Probably got broken because of the refactor.
|
2018-06-30 10:53:36 +02:00 |
|
omar
|
ce500f8727
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
|
2018-06-22 12:01:42 +02:00 |
|
omar
|
d68633398b
|
Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.
|
2018-06-22 10:02:02 +02:00 |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-06-10 15:59:35 +02:00 |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
2018-06-10 15:42:14 +02:00 |
|