omar
							
						 
					 | 
					
						
						
							
						
						e32256b4b4
					 | 
					
						
						
							
							Merge branch 'viewport' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2018-09-14 11:38:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1afd29d382
					 | 
					
						
						
							
							Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
						
						
						
						
						
						
					 | 
					
						2018-09-13 16:50:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						49533bc86e
					 | 
					
						
						
							
							Examples: Enabled Docking + Nav by default in the branch. (#351)
						
						
						
						
						
						
					 | 
					
						2018-09-06 21:53:35 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luk1337
							
						 
					 | 
					
						
						
							
						
						e3eb4111cc
					 | 
					
						
						
							
							Examples: Fix 'How to build' instructions for SDL2 examples (#2012)
						
						
						
						
						
						
					 | 
					
						2018-08-08 18:55:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ff83d0e369
					 | 
					
						
						
							
							Examples: Using fully qualified "Dear ImGui" name in window titles.
						
						
						
						
						
						
					 | 
					
						2018-07-23 17:31:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						73e13a0762
					 | 
					
						
						
							
							Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
						
						
						
						
						
						
					 | 
					
						2018-07-16 22:17:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						528b0b4af6
					 | 
					
						
						
							
							Examples: SDL+OpenGL2: Fixed Makefile. (#1886)
						
						
						
						
						
						
					 | 
					
						2018-06-20 11:17:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6f7b7807ad
					 | 
					
						
						
							
							Fixed Travis path + various paths in comments/documentations
						
						
						
						
						
						
					 | 
					
						2018-06-10 16:14:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5a13e4dcde
					 | 
					
						
						
							
							Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits
						
						
						
						
						
						
					 | 
					
						2018-06-10 15:58:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8d58fbb5ed
					 | 
					
						
						
							
							Examples: Renamed example folders. (#1870)
						
						
						
						
						
						
					 | 
					
						2018-06-10 15:42:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |