mark/imgui

Fork: 0

mark / imgui

History for imgui / imgui.cpp

2019-01-20	f94af2f Browse files » Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp omar committed on 20 Jan 2019
	8079344 Browse files » 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 omar committed on 20 Jan 2019
	2c38b32 Browse files » Removed trailing spaces (#2038, #2299) omar committed on 20 Jan 2019
	f94ba54 Browse files » Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277) omar committed on 20 Jan 2019
2019-01-18	fcd61e0 Browse files » Comments about DLL boundaries and using TLS variables for GImGui. (#2292) omar committed on 18 Jan 2019
2019-01-17	b5144e4 Browse files » Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt omar committed on 17 Jan 2019
2019-01-17	e9c625a Browse files » Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp omar committed on 17 Jan 2019
2019-01-16	d1851ed Browse files » Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch] omar committed on 16 Jan 2019
	32c4e01 Browse files » Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) omar committed on 16 Jan 2019
	06aaf23 Browse files » Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) omar committed on 16 Jan 2019
2019-01-15	09f1cb6 Browse files » FreeType: Minor tweaks previous commit (#2285) omar committed on 15 Jan 2019
	8a45c56 Browse files » Merge branch 'viewport' into docking omar committed on 15 Jan 2019
	9391a97 Browse files » Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h omar committed on 15 Jan 2019
	79d497e Browse files » Viewport: Made platform_io.Monitors mandatory for proper multi-viewport use. omar committed on 15 Jan 2019
	95ee99e Browse files » Version 1.68 WIP omar committed on 15 Jan 2019
	515ad62 Browse files » Merge branch 'viewport' into docking ... # Conflicts: # docs/TODO.txt omar committed on 15 Jan 2019
	73353fa Browse files » Merge branch 'master' into viewport omar committed on 15 Jan 2019
	b8c6e31 Browse files » Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282) omar committed on 15 Jan 2019
2019-01-14	ff4bd75 Browse files » Merge branch 'viewport' into docking omar committed on 14 Jan 2019
	e24674f Browse files » Merge branch 'master' into viewport omar committed on 14 Jan 2019
	7a5058e Browse files » Version 1.67 omar committed on 14 Jan 2019
2019-01-13	6e41745 Browse files » Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277) omar committed on 13 Jan 2019
	529fccd Browse files » Merge branch 'viewport' into docking omar committed on 13 Jan 2019
	4ee4f65 Browse files » Merge branch 'master' into viewport omar committed on 13 Jan 2019
2019-01-12	49994ce Browse files » FAQ entry, moved ImTextureId, Gallery links. omar committed on 12 Jan 2019
2019-01-10	7cc86d4 Browse files » Docking: Fixed docking a split node into the empty central node of a dockspace leading to the central node tag being incorrectly carried along. (#2109) omar committed on 10 Jan 2019
	8011197 Browse files » Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp omar committed on 10 Jan 2019
	c96aaef Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h omar committed on 10 Jan 2019
	1f6e0b2 Browse files » ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal). omar committed on 10 Jan 2019
2019-01-08	61a99f9 Browse files » Minot internal tweaks, comments omar committed on 8 Jan 2019