mark/imgui

Fork: 0

mark / imgui

2015-07-12	7eca4e2 Browse files » Merge bits ocornut committed on 12 Jul 2015
	fbb9113 Browse files » Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ... Conflicts: imgui.cpp ocornut committed on 12 Jul 2015
	4565bf9 Browse files » Demo: custom rendering example uses AddRectFilledMultiColor() ocornut committed on 12 Jul 2015
	6520b6c Browse files » ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. ocornut committed on 12 Jul 2015
2015-07-11	7a0004e Browse files » Revert ocornut committed on 11 Jul 2015
	d10d034 Browse files » Plot() function can take 0.0f for both scale_min/scale_max to calculate scale ocornut committed on 11 Jul 2015
	e681937 Browse files » Delete merging artefact that survived for a day ocornut committed on 11 Jul 2015
2015-07-10	fd44b94 Browse files » Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ... Conflicts: imgui.cpp ocornut committed on 10 Jul 2015
	b67593a Browse files » Changed SameLine() parameters from int to float. ocornut committed on 10 Jul 2015
	8094aa7 Browse files » Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere() ocornut committed on 10 Jul 2015
	827ff97 Browse files » InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag ocornut committed on 10 Jul 2015
	d270172 Browse files » InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification. ocornut committed on 10 Jul 2015
2015-07-09	f2bed00 Browse files » Examples: README ocornut committed on 9 Jul 2015
2015-07-08	5ab23ab Browse files » Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval ocornut committed on 8 Jul 2015
	398ef1a Browse files » Comments ocornut committed on 8 Jul 2015
	245cf36 Browse files » Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ocornut committed on 8 Jul 2015
	890585c Browse files » Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ocornut committed on 8 Jul 2015
	08b1dd1 Browse files » Version number 1.43 WIP ... Bits ocornut committed on 8 Jul 2015
	fec09e3 Browse files » Disable warnings, undo `f4aae6b` (#265 #266) ocornut committed on 8 Jul 2015
	7d45c84 Browse files » Merge pull request #266 from Extrawurst/patch-4 ... Fix minor clang-x64 warnings (fixes #265) omar committed on 8 Jul 2015
	f4aae6b Browse files » fix minor clang-x64 warnings ... fixes #265 Stephan Dilly committed on 8 Jul 2015
	09e8c4e Browse files » AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133) ocornut committed on 8 Jul 2015
	d81ba43 Browse files » New demo binaries omar committed on 8 Jul 2015
	v1.42 e5bea65 Browse files » Version number 1.42 ocornut committed on 8 Jul 2015
	2f574ef Browse files » Allegro 5 example: converted for indexed rendering. ocornut committed on 8 Jul 2015
	60dd221 Browse files » Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ocornut committed on 8 Jul 2015
	bbaaab7 Browse files » Allegro 5 example: fixed uv coordinate of non-default texture. ocornut committed on 8 Jul 2015
	4d2d0ce Browse files » Allegro 5 example: handling of hardware and software mouse cursor rendering. ocornut committed on 8 Jul 2015
	8db229b Browse files » Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup. ocornut committed on 8 Jul 2015
	c58d61d Browse files » Allegro 5 example: formatting, match other example structure, fixed mouse buttons. ocornut committed on 8 Jul 2015