mark/imgui

Fork: 0

mark / imgui

History for imgui / imgui.cpp

2018-09-06	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
	0b18c11 Browse files » Refactor: Moved ImFile functions. (#2036) omar committed on 6 Sep 2018
	ab64e8f Browse files » Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. (#2036) omar committed on 6 Sep 2018
2018-09-05	31b5b18 Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp omar committed on 5 Sep 2018
	bb3184a Browse files » Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) (#2036) omar committed on 5 Sep 2018
	cbdce80 Browse files » Internals: Refactor: Moved render functions to their own section. (#2036) omar committed on 5 Sep 2018
	8601c39 Browse files » Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542) omar committed on 5 Sep 2018
	af27ec2 Browse files » Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags ... # Conflicts: # imgui.cpp # imgui.h omar committed on 5 Sep 2018
	65876f3 Browse files » Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787) omar committed on 5 Sep 2018
	77ba883 Browse files » Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout. omar committed on 5 Sep 2018
	bbcc976 Browse files » Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent. omar committed on 5 Sep 2018
	b944aa6 Browse files » Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';' omar committed on 5 Sep 2018
	a848807 Browse files » Minor inconsequential merges from Master/Docking branches omar committed on 5 Sep 2018
	bdb30d7 Browse files » Merge branch 'master' into viewport omar committed on 5 Sep 2018
	897e5c6 Browse files » Viewport: Moved code following refactor. (#2036, #1542) omar committed on 5 Sep 2018
2018-09-04	40db2ca Browse files » Fixed a build issue with non-Cygwin GCC under Windows. omar committed on 4 Sep 2018
2018-09-03	1007873 Browse files » Misc: merge minor/inconsequential stuff from Docking branch to reduce drift. omar committed on 3 Sep 2018
2018-09-03	bcb1441 Browse files » Version 1.65 WIP omar committed on 3 Sep 2018
2018-08-31	fd201a9 Browse files » Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp omar committed on 31 Aug 2018
	5d40d29 Browse files » Comments, readme updates omar committed on 31 Aug 2018
	fd90afe Browse files » Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542) omar committed on 31 Aug 2018
	5207afa Browse files » Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542) omar committed on 31 Aug 2018
	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	c833912 Browse files » Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036) omar committed on 30 Aug 2018