mark/imgui

Fork: 0

mark / imgui

History for imgui / imgui_draw.cpp

2018-10-18	056af2b Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h omar committed on 18 Oct 2018
2018-10-15	8606d9f Browse files » Fix Clang/GCC's null-conversion warning: (#2081) ... The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example. Elias Daler authored on 15 Oct 2018 omar committed on 15 Oct 2018
2018-10-12	e73217d Browse files » Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp omar committed on 12 Oct 2018
	ede3a3b Browse files » Fixes crash introduced in previous commit 9cf94d5. omar committed on 12 Oct 2018
	9cf94d5 Browse files » RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate. omar committed on 12 Oct 2018
2018-09-26	6cc380f Browse files » Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp omar committed on 26 Sep 2018
2018-09-21	5719b23 Browse files » ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty. omar committed on 21 Sep 2018
2018-09-14	b85f345 Browse files » 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 omar committed on 14 Sep 2018
2018-09-11	201fcfd Browse files » Internals: Replace unsigned short with ImWchar when dealing with character storage. (#2078) ice1000 authored on 11 Sep 2018 omar committed on 11 Sep 2018
2018-09-11	df65d4a Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h omar committed on 11 Sep 2018
2018-09-06	eb7033e Browse files » Version 1.66 WIP omar committed on 6 Sep 2018
	b974fff Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp omar committed on 6 Sep 2018
	v1.65 e0cab56 Browse files » Version 1.65 omar committed on 6 Sep 2018
	5a679a4 Browse files » Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718, #2036) ... If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths. The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified. omar committed on 6 Sep 2018
	a2616c7 Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp omar committed on 6 Sep 2018
	e58bc3d Browse files » Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036) omar committed on 6 Sep 2018
2018-09-05	a848807 Browse files » Minor inconsequential merges from Master/Docking branches omar committed on 5 Sep 2018
2018-09-05	bdb30d7 Browse files » Merge branch 'master' into viewport omar committed on 5 Sep 2018
2018-09-03	bcb1441 Browse files » Version 1.65 WIP omar committed on 3 Sep 2018
2018-08-31	0c24fe2 Browse files » Merge branch 'master_164' into viewport_164 ... # Conflicts: # imgui.cpp # imgui_draw.cpp # imgui_widgets.cpp omar committed on 31 Aug 2018
	48db571 Browse files » Version 1.64 omar committed on 31 Aug 2018
	38cfcf9 Browse files » Tweak comments and indexes omar committed on 31 Aug 2018
2018-08-30	a58e4df Browse files » Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036) omar committed on 30 Aug 2018
	df37a15 Browse files » Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036) omar committed on 30 Aug 2018
	6c34bff Browse files » Version 1.64 WIP omar committed on 30 Aug 2018
	f2aa124 Browse files » Version 1.64 WIP omar committed on 30 Aug 2018
2018-08-29	36b2f64 Browse files » Merge branch 'master' into viewport ... # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h omar committed on 29 Aug 2018
	9e0f24d Browse files » Version 1.63 omar committed on 29 Aug 2018
	92edb7a Browse files » Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor) omar committed on 29 Aug 2018
2018-08-25	f81caac Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h omar committed on 25 Aug 2018