mark/imgui

Fork: 0

mark / imgui

2018-09-05	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-04	5451cb7 Browse files » Readme, Changelog (#2059) 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
	f8b7e4d Browse files » Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002) ... `gladLoadGL` returns 0 on fail, not the other way around. Jiří Šebele authored on 3 Sep 2018 omar committed on 3 Sep 2018
	d07f494 Browse files » Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. (#2036) ... Renamed RoundScalarWithFormat -> RoundScalarWithFormatT. Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT omar committed on 3 Sep 2018
	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
	v1.64 767649a Browse files » Fix missing include on some systems to use intptr_t. (#2036, #2054) omar committed on 31 Aug 2018
	5d40d29 Browse files » Comments, readme updates omar committed on 31 Aug 2018
	be6ea86 Browse files » OSX: Added imgui_widgets.cpp to xcode project files. Omar Cornut committed on 31 Aug 2018
	a52ce7a Browse files » Merge branch 'master' into viewport 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
	9174958 Browse files » imgui_stl: Comments (#2035) omar committed on 31 Aug 2018
	0699310 Browse files » Merge branch 'viewport_164' into viewport 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
	36435b4 Browse files » Merge branch 'master_164' 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
	00262d5 Browse files » Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036) omar committed on 30 Aug 2018
	d7c04cc Browse files » Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036) omar committed on 30 Aug 2018
	b1f263b Browse files » Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036) omar committed on 30 Aug 2018
	a58e4df Browse files » Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036) omar committed on 30 Aug 2018
	8a216fe Browse files » Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036) omar committed on 30 Aug 2018
	fd2bfb7 Browse files » Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036) omar committed on 30 Aug 2018
	064b949 Browse files » Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036) omar committed on 30 Aug 2018