ocornut
							
						 
					 | 
					
						
						
							
						
						0f25885b3d
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/ocornut/imgui
						
						
						
						
						
						
					 | 
					
						2015-07-15 17:02:38 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9d4d7f3381
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2015-07-15 17:00:47 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						298118fccc
					 | 
					
						
						
							
							New screenshots
						
						
						
						
						
						
					 | 
					
						2015-07-15 16:58:38 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d19d8f40ba
					 | 
					
						
						
							
							Removed web screenshots (moved to wiki repository)
						
						
						
						
						
						
					 | 
					
						2015-07-15 16:27:33 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d170620816
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-07-15 14:59:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4842ac3bc6
					 | 
					
						
						
							
							Fonts: added Cousine-Regular.ttf
						
						
						
						
						
						
					 | 
					
						2015-07-15 14:56:29 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5e846612d3
					 | 
					
						
						
							
							ImFont: tweaks
						
						
						
						
						
						
					 | 
					
						2015-07-15 14:54:56 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						80276ef07b
					 | 
					
						
						
							
							Fixed ClearInputData()
						
						
						
						
						
						
					 | 
					
						2015-07-15 14:48:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6c3ab6fc9b
					 | 
					
						
						
							
							ImFont: fixed minor bug with CPU-side vertical clipping of text.
						
						
						
						
						
						
					 | 
					
						2015-07-15 13:34:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a56768463a
					 | 
					
						
						
							
							Examples: moved demo bits around.
						
						
						
						
						
						
					 | 
					
						2015-07-15 13:16:35 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d750df9189
					 | 
					
						
						
							
							Fix for Shutdown()
						
						
						
						
						
						
					 | 
					
						2015-07-15 12:37:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						baa2328b99
					 | 
					
						
						
							
							Tweak to RenderCheckMark()
						
						
						
						
						
						
					 | 
					
						2015-07-15 12:31:37 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d7a2a23457
					 | 
					
						
						
							
							Updated to stb_truetype 1.06 (#133)
						
						
						
						
						
						
					 | 
					
						2015-07-15 12:12:36 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8081e81e55
					 | 
					
						
						
							
							Fixed warnings + label
						
						
						
						
						
						
					 | 
					
						2015-07-15 11:56:07 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						1a3ef63132
					 | 
					
						
						
							
							Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading)
						
						
						
						
						
						
						
						Thanks Coverity 
						
						
					 | 
					
						2015-07-15 09:36:39 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						368d2c3568
					 | 
					
						
						
							
							OverlayDrawList readier for pushing elements (not exposed yet)
						
						
						
						
						
						
					 | 
					
						2015-07-15 09:26:03 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0224d29a35
					 | 
					
						
						
							
							Examples: comments.
						
						
						
						
						
						
					 | 
					
						2015-07-15 09:05:17 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						035ff302d2
					 | 
					
						
						
							
							ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont()
						
						
						
						
						
						
					 | 
					
						2015-07-15 08:45:10 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						95f489ac1f
					 | 
					
						
						
							
							Merged AA branch in master! (#133)
						
						
						
						
						
						
					 | 
					
						2015-07-15 08:00:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3e3d9f9a69
					 | 
					
						
						
							
							ImFontAtlas: allow AddFontDefault to take a config
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:58:33 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7ad4843f57
					 | 
					
						
						
							
							Fixed comments
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:52:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						99a92ee7c5
					 | 
					
						
						
							
							Comments (fixed old comments)
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:46:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8952b93b2f
					 | 
					
						
						
							
							Include for alloca()
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:31:32 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fcec337061
					 | 
					
						
						
							
							Examples: Simplified font examples comments.
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:05:34 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						815168c7ef
					 | 
					
						
						
							
							ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242)
						
						
						
						
						
						
					 | 
					
						2015-07-15 07:01:21 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6ae8062ca0
					 | 
					
						
						
							
							ImFont: comments, minor bits
						
						
						
						
						
						
					 | 
					
						2015-07-14 15:51:19 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c02f9b58ef
					 | 
					
						
						
							
							ImFont: Cleanup to be compatible with over-sampling (not enabled)
						
						
						
						
						
						
					 | 
					
						2015-07-14 12:41:02 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fc6545830b
					 | 
					
						
						
							
							Examples: displaying more font information.
						
						
						
						
						
						
					 | 
					
						2015-07-14 10:28:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						faec745438
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
					 | 
					
						2015-07-14 09:23:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8cfd963fda
					 | 
					
						
						
							
							Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus (#272)
						
						
						
						
						
						
					 | 
					
						2015-07-14 09:21:41 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						355cbf6326
					 | 
					
						
						
							
							Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window (#272)
						
						
						
						
						
						
					 | 
					
						2015-07-14 09:10:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						52c820e7b0
					 | 
					
						
						
							
							Metrics: more details in popup stack (#272)
						
						
						
						
						
						
					 | 
					
						2015-07-14 09:09:52 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						ba9317b924
					 | 
					
						
						
							
							ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
						
						
						
						
						
						
					 | 
					
						2015-07-13 16:08:49 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5b053dd350
					 | 
					
						
						
							
							Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
						
						
						
						
						
						
					 | 
					
						2015-07-13 15:52:57 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7eca4e2a7f
					 | 
					
						
						
							
							Merge bits
						
						
						
						
						
						
					 | 
					
						2015-07-12 11:05:30 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fbb9113118
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-07-12 11:02:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4565bf9813
					 | 
					
						
						
							
							Demo: custom rendering example uses AddRectFilledMultiColor()
						
						
						
						
						
						
					 | 
					
						2015-07-12 10:52:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6520b6c458
					 | 
					
						
						
							
							ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
						
						
						
						
						
						
					 | 
					
						2015-07-12 10:48:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7a0004eb86
					 | 
					
						
						
							
							Revert
						
						
						
						
						
						
					 | 
					
						2015-07-11 18:15:34 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d10d0343b2
					 | 
					
						
						
							
							Plot() function can take 0.0f for both scale_min/scale_max to calculate scale
						
						
						
						
						
						
					 | 
					
						2015-07-11 18:10:43 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e681937f66
					 | 
					
						
						
							
							Delete merging artefact that survived for a day
						
						
						
						
						
						
					 | 
					
						2015-07-11 08:41:11 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fd44b9440b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-07-10 21:45:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b67593a4b1
					 | 
					
						
						
							
							Changed SameLine() parameters from int to float.
						
						
						
						
						
						
					 | 
					
						2015-07-10 19:36:34 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8094aa78d2
					 | 
					
						
						
							
							Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
						
						
						
						
						
						
					 | 
					
						2015-07-10 18:54:26 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						827ff970cd
					 | 
					
						
						
							
							InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
						
						
						
						
						
						
					 | 
					
						2015-07-10 18:47:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d2701727b9
					 | 
					
						
						
							
							InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
						
						
						
						
						
						
					 | 
					
						2015-07-10 18:17:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f2bed00d80
					 | 
					
						
						
							
							Examples: README
						
						
						
						
						
						
					 | 
					
						2015-07-09 08:39:44 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5ab23ab1c0
					 | 
					
						
						
							
							Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
						
						
						
						
						
						
					 | 
					
						2015-07-08 17:25:56 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						398ef1a212
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-07-08 17:10:14 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						245cf36522
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
					 | 
					
						2015-07-08 17:09:47 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |