mark/imgui

Fork: 0

mark / imgui

2017-09-18	44e8d94 Browse files » Merge branch 'master' into navigation omar committed on 18 Sep 2017
	105f3b1 Browse files » Merge branch 'master' into styles omar committed on 18 Sep 2017
	564c97b Browse files » Comments omar committed on 18 Sep 2017
	f0f8621 Browse files » ImVector: added resize() variant with initialization value omar committed on 18 Sep 2017
	b409d39 Browse files » Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update omar committed on 18 Sep 2017
	9693fd5 Browse files » PushStyleVar/PopStyleVar: internal tweaks omar committed on 18 Sep 2017
	7c9e38f Browse files » Style: Moving code in a function to make incoming diff easier to parse. omar committed on 18 Sep 2017
	709653c Browse files » Merge branch 'master' into styles omar committed on 18 Sep 2017
2017-09-17	6c91a1e Browse files » Minor comments omar committed on 17 Sep 2017
2017-09-15	2aa9a53 Browse files » Merge pull request #1323 from waywardmonkeys/remove-commas-at-end-of-list ... Remove commas after last item in enumeration to stay compatible with older compilers. omar authored on 15 Sep 2017 GitHub committed on 15 Sep 2017
2017-09-14	c4c042b Browse files » Typo omar committed on 14 Sep 2017
	052999a Browse files » More consistently uses "Dear ImGui" omar committed on 14 Sep 2017
	83645aa Browse files » More consistently uses "Dear ImGui" omar authored on 14 Sep 2017 GitHub committed on 14 Sep 2017
2017-09-13	2fcdeb7 Browse files » Remove commas after last item in enumeration. ... This brings these enums to match the rest of the code and fixes 2 warnings under clang about using C++11 extensions. Bruce Mitchener committed on 13 Sep 2017
2017-09-12	54d30d7 Browse files » Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags omar committed on 12 Sep 2017
2017-09-12	65632d2 Browse files » Fixed alloca include for SunOS (#1319) omar committed on 12 Sep 2017
2017-09-11	3420080 Browse files » Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut ... Simplify alloca.h include condition (fix for NetBSD) omar authored on 11 Sep 2017 GitHub committed on 11 Sep 2017
2017-09-11	cf6ba9d Browse files » Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h Daniel Loffgren committed on 11 Sep 2017
2017-09-06	66a9d48 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h omar committed on 6 Sep 2017
	cb2775a Browse files » Internals: ImGuiItemFlags comments omar committed on 6 Sep 2017
	62d7fa4 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h omar committed on 6 Sep 2017
	f63c03c Browse files » Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch. omar committed on 6 Sep 2017
	51fcef0 Browse files » BeginCombo() tweaks, merged from Navigation branch. omar committed on 6 Sep 2017
	38ed66f Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp omar committed on 6 Sep 2017
	9e2f202 Browse files » Demo: Not using the undesirable Begin() overload. omar committed on 6 Sep 2017
	5c4fda0 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h omar committed on 6 Sep 2017
	2169bf6 Browse files » Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317) omar committed on 6 Sep 2017
	790605e Browse files » Minor comments + renaming internal fields omar committed on 6 Sep 2017
2017-09-05	8971d70 Browse files » Merge pull request #1313 from thevaber/master ... Improved ColorPicker hue wheel color interpolation omar authored on 5 Sep 2017 GitHub committed on 5 Sep 2017
2017-09-05	e1a7aa4 Browse files » Improved ColorPicker hue wheel color interpolation Václav Patejdl committed on 5 Sep 2017