omar
							
						 
					 | 
					
						
						
							
						
						17b63d846f
					 | 
					
						
						
							
							Merge pull request #194 from Roflraging/master
						
						
						
						
						
						
						
						Examples: GLFW Set modifier key state by inspecting imgui's io.KeysDown array (see #183) 
						
						
					 | 
					
						2015-04-14 20:33:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dale Kim
							
						 
					 | 
					
						
						
							
						
						ac518a1d3e
					 | 
					
						
						
							
							Set modifier key state by inspecting imgui's io.KeysDown array.
						
						
						
						
						
						
					 | 
					
						2015-04-14 14:09:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						de3a154f38
					 | 
					
						
						
							
							Tweak date/credits
						
						
						
						
						
						
					 | 
					
						2015-04-14 12:00:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						43cb4038c6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
						
						
						
						
						
						
						
						Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp 
						
						
					 | 
					
						2015-04-14 09:51:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0bb89ccee2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-04-14 09:49:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						71429d306e
					 | 
					
						
						
							
							Examples: Simplified GLFW keyboard callbacks
						
						
						
						
						
						
					 | 
					
						2015-04-14 09:45:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c735d3066b
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
						
						
						
						
						
						
					 | 
					
						2015-04-14 09:37:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dale Kim
							
						 
					 | 
					
						
						
							
						
						fe15756129
					 | 
					
						
						
							
							Simplified glfw keyboard callbacks.
						
						
						
						
						
						
					 | 
					
						2015-04-13 20:04:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						88bc8efab0
					 | 
					
						
						
							
							Merge pull request #193 from Extrawurst/patch-3
						
						
						
						
						
						
						
						Fix outdated documentation 
						
						
					 | 
					
						2015-04-14 00:22:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Dilly
							
						 
					 | 
					
						
						
							
						
						b28ec1f3b1
					 | 
					
						
						
							
							fix outdated documentation
						
						
						
						
						
						
					 | 
					
						2015-04-14 00:40:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						dd36e8bf2b
					 | 
					
						
						
							
							Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete).
						
						
						
						
						
						
					 | 
					
						2015-04-13 22:04:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d11b4160aa
					 | 
					
						
						
							
							Added IsItemVisible(). Made IsClipped() also return false when log is enabled.
						
						
						
						
						
						
					 | 
					
						2015-04-13 21:52:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						16ddd796f3
					 | 
					
						
						
							
							Active widgets is not clipped, so it can always release its active state (mentioned in #143)
						
						
						
						
						
						
						
						Otherwise a change in layout moving active widget to a clipped region
may lock the active id. 
						
						
					 | 
					
						2015-04-13 20:59:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9918ec31d6
					 | 
					
						
						
							
							Added ResetMouseDragDelta() for iterative dragging operations
						
						
						
						
						
						
					 | 
					
						2015-04-13 19:54:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a143e2e772
					 | 
					
						
						
							
							Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies
						
						
						
						
						
						
					 | 
					
						2015-04-13 14:45:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						750b6c9224
					 | 
					
						
						
							
							DragFloat() fixed clamping #180
						
						
						
						
						
						
					 | 
					
						2015-04-13 00:07:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6ed06a8dc8
					 | 
					
						
						
							
							DragFloat() added power parameter for logarithmic drag on both side of zero #180
						
						
						
						
						
						
					 | 
					
						2015-04-13 00:03:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f5ad362912
					 | 
					
						
						
							
							DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
						
						
						
						
						
						
					 | 
					
						2015-04-12 19:15:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0dc3d07e7f
					 | 
					
						
						
							
							DragInt() step given as float to allow finer control of speed #180
						
						
						
						
						
						
					 | 
					
						2015-04-12 19:08:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						62abde5b37
					 | 
					
						
						
							
							DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
						
						
						
						
						
						
					 | 
					
						2015-04-12 19:07:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b308d2728b
					 | 
					
						
						
							
							Remove stray tabs
						
						
						
						
						
						
					 | 
					
						2015-04-12 10:45:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						adae98664e
					 | 
					
						
						
							
							Comment on the newly added binary_to_compressed_c.cpp helper program
						
						
						
						
						
						
					 | 
					
						2015-04-12 10:31:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						88725be381
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-04-11 18:13:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7ca21a1bc2
					 | 
					
						
						
							
							Fixed prototypes
						
						
						
						
						
						
					 | 
					
						2015-04-11 18:12:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						ac740170b9
					 | 
					
						
						
							
							Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
						
						
						
						
						
						
					 | 
					
						2015-04-11 18:00:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bff9a6b6e3
					 | 
					
						
						
							
							Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
						
						
						
						
						
						
					 | 
					
						2015-04-11 17:52:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d809abbe1c
					 | 
					
						
						
							
							Examples: DirectX11: tidying up.
						
						
						
						
						
						
					 | 
					
						2015-04-09 23:32:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c3a71f5472
					 | 
					
						
						
							
							AA branch: Minor optimisation merge + thickness for non-aa strokes.
						
						
						
						
						
						
					 | 
					
						2015-04-09 23:00:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						dbc9b2ec9b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-04-09 22:56:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6bdb8719e2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
						
						
						
						
						
						
					 | 
					
						2015-04-09 22:50:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a48130b682
					 | 
					
						
						
							
							ImDrawList: Minor optimisation.
						
						
						
						
						
						
					 | 
					
						2015-04-09 22:49:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e0cd947904
					 | 
					
						
						
							
							AA branch: Fixes.
						
						
						
						
						
						
					 | 
					
						2015-04-09 22:40:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						1e69175403
					 | 
					
						
						
							
							AA branch: Test disabling aa at runtime for stroke and fill.
						
						
						
						
						
						
					 | 
					
						2015-04-09 22:31:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						431e391ccd
					 | 
					
						
						
							
							AA branch: fixed circles.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:51:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						dd893ac4f5
					 | 
					
						
						
							
							Warning fix.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:43:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						14ddb81f7a
					 | 
					
						
						
							
							AA branch: remove code unnecessary for this branch.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:39:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						39445cf23a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp
	imgui.h 
						
						
					 | 
					
						2015-04-09 21:38:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7ab49f80ca
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
						
						
						
						
						
						
						
						Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp 
						
						
					 | 
					
						2015-04-09 21:22:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4f51b77937
					 | 
					
						
						
							
							Examples: OpenGL3: Tweaks (argh, github ui)
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:19:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						90766141b3
					 | 
					
						
						
							
							Examples: OpenGL3: Tweaks.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:18:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						37f1715bfa
					 | 
					
						
						
							
							Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:14:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						1746b04065
					 | 
					
						
						
							
							Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:05:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						500a8a0e02
					 | 
					
						
						
							
							ImDrawList: bits of renaming.
						
						
						
						
						
						
					 | 
					
						2015-04-09 21:00:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4fa3eee84e
					 | 
					
						
						
							
							Renamed io.MetricsVertices to io.MetricsRenderVertices
						
						
						
						
						
						
					 | 
					
						2015-04-09 19:47:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						aa1a96f907
					 | 
					
						
						
							
							ImDrawList: inline AddVtx() calls for profit in highly debug builds
						
						
						
						
						
						
					 | 
					
						2015-04-09 18:34:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						334fba2f56
					 | 
					
						
						
							
							Spacing
						
						
						
						
						
						
					 | 
					
						2015-04-09 17:33:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						707df6c7b7
					 | 
					
						
						
							
							ImDrawList: internal refactoring toward a following commit for indexed rendering.
						
						
						
						
						
						
					 | 
					
						2015-04-09 17:32:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						742808d835
					 | 
					
						
						
							
							Tweaks.
						
						
						
						
						
						
					 | 
					
						2015-04-09 17:24:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						15f82e0deb
					 | 
					
						
						
							
							Fix rounded frames to follow previous change
						
						
						
						
						
						
					 | 
					
						2015-04-09 17:20:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						aa2935968e
					 | 
					
						
						
							
							Renamed AddArcFast() parameter 'tris' to 'filled'
						
						
						
						
						
						
					 | 
					
						2015-04-09 16:47:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |