omar
							
						 
					 | 
					
						
						
							
						
						77d51ebf24
					 | 
					
						
						
							
							Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.
						
						
						
						
						
						
					 | 
					
						2018-06-07 19:20:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						929522febe
					 | 
					
						
						
							
							Missing examples changelog bits and todo list
						
						
						
						
						
						
					 | 
					
						2018-05-25 12:51:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						03c8a78f04
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp 
						
						
					 | 
					
						2018-05-25 12:44:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9770c8b21d
					 | 
					
						
						
							
							Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. (#1836)
						
						
						
						
						
						
					 | 
					
						2018-05-25 12:09:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5fd23eeb74
					 | 
					
						
						
							
							Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. (#1835)
						
						
						
						
						
						
					 | 
					
						2018-05-24 17:42:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						bef0a13283
					 | 
					
						
						
							
							Examples: Comments about GLSL version not being the same as GL context version. (#1828)
						
						
						
						
						
						
					 | 
					
						2018-05-21 11:28:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						663e2c9237
					 | 
					
						
						
							
							Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. (#1827)
						
						
						
						
						
						
					 | 
					
						2018-05-21 10:36:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ice1000
							
						 
					 | 
					
						
						
							
						
						e8a72d3e72
					 | 
					
						
						
							
							Examples: GLFW* Make subsequent window creation possible.
						
						
						
						
						
						
					 | 
					
						2018-05-21 10:34:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						01429e7d16
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2018-05-17 15:03:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						19544629be
					 | 
					
						
						
							
							Examples: OpenGL3: Trying to make the call to glBindSampler optional to make the example code easier to use/share with different context version. (#1806)
						
						
						
						
						
						
					 | 
					
						2018-05-14 17:47:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						85f3ba844c
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2018-05-11 22:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						090eb437ed
					 | 
					
						
						
							
							Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-05-11 16:41:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d574604a5d
					 | 
					
						
						
							
							Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-05-11 16:41:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6eacddb50f
					 | 
					
						
						
							
							Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-05-10 13:10:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						39f4761ff7
					 | 
					
						
						
							
							TODO list update + Changelog and comments for #1803.
						
						
						
						
						
						
					 | 
					
						2018-05-09 15:48:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elias Daler
							
						 
					 | 
					
						
						
							
						
						895647a240
					 | 
					
						
						
							
							Fixed clipboard paste memory leak in SDL examples. (#1803)
						
						
						
						
						
						
					 | 
					
						2018-05-09 15:48:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4ff23d3306
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2018-05-07 22:23:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4310bad32a
					 | 
					
						
						
							
							Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h (#1790, #1687)
						
						
						
						
						
						
					 | 
					
						2018-05-07 11:52:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SR_team
							
						 
					 | 
					
						
						
							
						
						d0051ce5cb
					 | 
					
						
						
							
							add renderstate D3DRS_SHADEMODE for Dx9 impl
						
						
						
						
						
						
						
						add backuping transform for Dx9 impl
(#1790, #1687) 
						
						
					 | 
					
						2018-05-07 11:52:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cd51f37fc0
					 | 
					
						
						
							
							Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-26 16:18:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						da70c837da
					 | 
					
						
						
							
							Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-26 15:30:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						eb1c36fdfb
					 | 
					
						
						
							
							Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695, #1769)
						
						
						
						
						
						
					 | 
					
						2018-04-25 22:07:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3b9b1956cd
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/allegro5_example/imgui_impl_a5.cpp
#	examples/allegro5_example/imgui_impl_a5.h
#	examples/allegro5_example/imgui_impl_allegro5.cpp
#	examples/allegro5_example/imgui_impl_allegro5.h
#	examples/allegro5_example/main.cpp
#	examples/imgui_impl_allegro5.cpp
#	examples/imgui_impl_allegro5.h
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2018-04-25 15:32:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7a41e0b1ea
					 | 
					
						
						
							
							Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-25 15:15:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e3e4b7bdf5
					 | 
					
						
						
							
							Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. (#1542)
						
						
						
						
						
						
						
						Platform: Clarifying some comments in back-ends. 
						
						
					 | 
					
						2018-04-24 17:10:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cb78e62df9
					 | 
					
						
						
							
							Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok.  (#1542)
						
						
						
						
						
						
						
						SDL2 ime support under Win32 never worked properly because of SDL interferences. 
						
						
					 | 
					
						2018-04-24 12:40:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						376f2aec54
					 | 
					
						
						
							
							Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the  beginning of the list. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-23 23:01:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d268471285
					 | 
					
						
						
							
							Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.
						
						
						
						
						
						
					 | 
					
						2018-04-23 18:56:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						423577e14e
					 | 
					
						
						
							
							Viewport, Platforms: SDL: Fixed initial focus click being ignored as a mouse button. GLFW: Fixed mouse cursor support for multi-viewport with GLFW 3.3 (current master) - somehow doesn't appear to work with GLFW 3.2 but I'm not too fussed about it.  (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-23 16:46:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4433ce4312
					 | 
					
						
						
							
							Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-23 12:38:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						456bbffcc4
					 | 
					
						
						
							
							Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-20 21:36:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						17a7f352b5
					 | 
					
						
						
							
							Viewporrt. Examples: DirectX10,11: Make the platform SetWindowSize handler not crash on failure to resize, which could happen (rarely) on invalid data or bug in the code.
						
						
						
						
						
						
					 | 
					
						2018-04-19 17:23:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						637d9c42bf
					 | 
					
						
						
							
							Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-19 13:12:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						bcac02809f
					 | 
					
						
						
							
							Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.
						
						
						
						
						
						
					 | 
					
						2018-04-18 21:55:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3913297384
					 | 
					
						
						
							
							Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).
						
						
						
						
						
						
					 | 
					
						2018-04-18 21:51:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1c385c2ca4
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2018-04-18 19:06:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								daniel-murray
							
						 
					 | 
					
						
						
							
						
						83d97d4a9b
					 | 
					
						
						
							
							Fix typos KeyDown => KeysDown
						
						
						
						
						
						
					 | 
					
						2018-04-14 10:28:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						950539b768
					 | 
					
						
						
							
							Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. (#1542, #1676)
						
						
						
						
						
						
					 | 
					
						2018-04-13 20:26:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						22d6f00110
					 | 
					
						
						
							
							Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. (#1542, #1676)
						
						
						
						
						
						
					 | 
					
						2018-04-13 11:14:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						285269ef55
					 | 
					
						
						
							
							Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-11 21:27:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						83bd3595a4
					 | 
					
						
						
							
							Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-10 22:58:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						32ee0a3947
					 | 
					
						
						
							
							Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-10 22:32:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7ddc22b326
					 | 
					
						
						
							
							Viewports, DPI: Renamed config flags. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-10 20:02:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0d5042f0f3
					 | 
					
						
						
							
							Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. (#1542)
						
						
						
						
						
						
					 | 
					
						2018-04-10 19:15:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d4dd448511
					 | 
					
						
						
							
							Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
						
						
						
						
						
						
					 | 
					
						2018-04-09 22:01:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						56ad2a2d74
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/vulkan_example/main.cpp
#	imgui.h 
						
						
					 | 
					
						2018-04-09 19:35:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						660c157880
					 | 
					
						
						
							
							Examples: Added missing calls for ::DestroyWindow, glfwDestroyWindow() + fix old comments.
						
						
						
						
						
						
					 | 
					
						2018-04-09 19:16:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						54fca1d1b8
					 | 
					
						
						
							
							Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fca94)  (#1733, ~#1731) + assert
						
						
						
						
						
						
					 | 
					
						2018-04-09 13:13:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f421e73b40
					 | 
					
						
						
							
							Merge branch 'master' into viewport
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h 
						
						
					 | 
					
						2018-04-06 23:36:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						72b7f48870
					 | 
					
						
						
							
							Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
						
						
						
						
						
						
					 | 
					
						2018-04-06 18:12:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |