omar
							
						 
					 | 
					
						
						
							
						
						346f83e014
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:41:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fefcc77f13
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:40:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b6cdfef442
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:38:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						172e426ba9
					 | 
					
						
						
							
							Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:36:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f74d9ec7f7
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:36:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9093166eea
					 | 
					
						
						
							
							Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:35:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f5ed5478e1
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:35:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9a4234ea8e
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:35:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						af002dc861
					 | 
					
						
						
							
							Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:34:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						adeb993122
					 | 
					
						
						
							
							Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:33:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						81bc4265e5
					 | 
					
						
						
							
							Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:32:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a44c5f7afe
					 | 
					
						
						
							
							Refactor: Internals: Moved various functions in imgui.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:30:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						66b51940bd
					 | 
					
						
						
							
							Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:30:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d4e49a2697
					 | 
					
						
						
							
							Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp 
						
						
							
						
					 | 
					
						2018-08-30 19:29:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						521405488b
					 | 
					
						
						
							
							Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:21:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						24dfa0c957
					 | 
					
						
						
							
							Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:12:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						158a65c98f
					 | 
					
						
						
							
							Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:04:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6caf074bd5
					 | 
					
						
						
							
							Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:04:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						905e14f384
					 | 
					
						
						
							
							Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:04:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4be79a8955
					 | 
					
						
						
							
							Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:04:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2d952504ed
					 | 
					
						
						
							
							Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:01:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						43219d36a6
					 | 
					
						
						
							
							Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:00:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						99b27488e7
					 | 
					
						
						
							
							Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:00:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						18972c5513
					 | 
					
						
						
							
							Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:00:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e312363007
					 | 
					
						
						
							
							Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:00:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6c34bffbb5
					 | 
					
						
						
							
							Version 1.64 WIP
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 19:00:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2714f8fa23
					 | 
					
						
						
							
							Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c25f48b902
					 | 
					
						
						
							
							Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ad0bfdcd95
					 | 
					
						
						
							
							Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5dc954f5d7
					 | 
					
						
						
							
							Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a265c62636
					 | 
					
						
						
							
							Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0e9577d0da
					 | 
					
						
						
							
							Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 15:40:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f26b8c1e07
					 | 
					
						
						
							
							Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:55:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6468a3c0ce
					 | 
					
						
						
							
							Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:50:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3eaa063984
					 | 
					
						
						
							
							Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:50:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						52c115fb2c
					 | 
					
						
						
							
							Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:50:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						01586d33f3
					 | 
					
						
						
							
							Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:29:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f2aa124eb8
					 | 
					
						
						
							
							Version 1.64 WIP
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-30 14:25:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						36b2f64051
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h 
						
						
							
						
					 | 
					
						2018-08-29 17:40:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1c4008aa97
					 | 
					
						
						
							
							Changelog tweaks/typos
						
						
						
						
						
						
							
 v1.63
						
					 | 
					
						2018-08-29 17:34:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9e0f24dcb6
					 | 
					
						
						
							
							Version 1.63
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-29 16:20:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ac0fcbca46
					 | 
					
						
						
							
							Changelog: fixed inconsistent white space before list items.
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-29 16:20:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						92edb7a4e3
					 | 
					
						
						
							
							Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-29 16:12:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ec148988f0
					 | 
					
						
						
							
							Reordered some declarations in imgui.h (in prevision of 1.64 refactor)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-29 16:12:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2598d26c73
					 | 
					
						
						
							
							ColorEdit4: Fixed a bug when text input or drag and drop leading to unsaturated HSL values would erroneously alter the resulting color. (#2050)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-29 13:30:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f9634feb66
					 | 
					
						
						
							
							Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR (#846)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-28 19:10:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						220e6a55b7
					 | 
					
						
						
							
							Travis: Fix (still not sure there is a way to test those files). (#1044)
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-28 18:40:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1b61b6b208
					 | 
					
						
						
							
							Examples: Vulkan: Minor tweaks.
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-28 18:22:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						db790dab4c
					 | 
					
						
						
							
							Travis: Added xcode build for the OSX+Metal example. (#1044) [@petmac]
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-28 18:15:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b127027cbd
					 | 
					
						
						
							
							Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
						
						
						
						
						
						
							
						
					 | 
					
						2018-08-28 16:08:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |