imgui

Commit Graph

Author	SHA1	Message	Date
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
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.	7 years ago
omar	ce500f8727	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp	7 years ago
omar	f9a5ff7a19	Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301 )	7 years ago
omar	24aeca3d0c	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp	7 years ago
omar	6f7b7807ad	Fixed Travis path + various paths in comments/documentations	7 years ago
omar	9660657e95	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	7 years ago
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870 )	7 years ago

10 Commits (0095b7a0ea8003d367b81042059856008a463ee9)