omar 
							
						 
					 
					
						
						
							
						
						0d7e779b37 
					 
					
						
						
							
							Merge branch 'master' into osx  
						
						... 
						
						
						
						# Conflicts:
#	examples/.gitignore
#	examples/README.txt 
						
						
					 
					
						2018-07-04 13:13:11 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a765c83bad 
					 
					
						
						
							
							Ignore list: added emscripten output  
						
						
						
						
					 
					
						2018-07-03 15:57:34 +02:00 
						 
				 
			
				
					
						
							
							
								Konstantin Podsvirov 
							
						 
					 
					
						
						
							
						
						ddb09c6011 
					 
					
						
						
							
							Examples: Ignore all *.user files ( #1919 )  
						
						... 
						
						
						
						For example `Qt Creator` create `CMakeLists.txt.user` file with user settings. 
						
						
					 
					
						2018-07-02 19:43:33 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c4e34aaace 
					 
					
						
						
							
							Examples: Comments to clarify how the keyboard data is indexed.  
						
						
						
						
					 
					
						2018-06-30 14:33:45 +02:00 
						 
				 
			
				
					
						
							
							
								codecnotsupported 
							
						 
					 
					
						
						
							
						
						b62cc5c150 
					 
					
						
						
							
							Fix include Example_glfw_vulkan cmake ( #1916 )  
						
						... 
						
						
						
						Probably got broken because of the refactor. 
						
						
					 
					
						2018-06-30 10:53:36 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						62b3d7c51e 
					 
					
						
						
							
							Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. ( #1913 ,  #1914 )  
						
						
						
						
					 
					
						2018-06-29 16:36:40 +02:00 
						 
				 
			
				
					
						
							
							
								Aiekick 
							
						 
					 
					
						
						
							
						
						ecd9a223e3 
					 
					
						
						
							
							add hand cursor support (+11 squashed commit)  
						
						
						
						
					 
					
						2018-06-29 16:36:40 +02:00 
						 
				 
			
				
					
						
							
							
								Omar Cornut 
							
						 
					 
					
						
						
							
						
						42a919f303 
					 
					
						
						
							
							Examples: Apple: Fixed paths of GLFW+GL2 example. ( #1906 ) Update ignore list.  
						
						
						
						
					 
					
						2018-06-27 09:39:52 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a1ec7723ef 
					 
					
						
						
							
							Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings.  
						
						
						
						
					 
					
						2018-06-25 09:50:06 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						20e89201cb 
					 
					
						
						
							
							Examples: Fixes.  
						
						
						
						
					 
					
						2018-06-23 09:42:47 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d68633398b 
					 
					
						
						
							
							Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.  
						
						
						
						
					 
					
						2018-06-22 10:02:02 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f9a5ff7a19 
					 
					
						
						
							
							Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. ( #301 )  
						
						
						
						
					 
					
						2018-06-21 12:13:04 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cac4c3f9b8 
					 
					
						
						
							
							Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. ( #1888 ) + Comments in imgui.h  
						
						
						
						
					 
					
						2018-06-21 12:04:00 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						528b0b4af6 
					 
					
						
						
							
							Examples: SDL+OpenGL2: Fixed Makefile. ( #1886 )  
						
						
						
						
					 
					
						2018-06-20 11:17:33 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c44a4bed84 
					 
					
						
						
							
							Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. ( #1887 )  
						
						
						
						
					 
					
						2018-06-20 11:06:29 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2ce121b7d0 
					 
					
						
						
							
							Readme, Links, Bindings  
						
						
						
						
					 
					
						2018-06-16 10:43:05 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						40845852b9 
					 
					
						
						
							
							Fixed warnings + readme  
						
						
						
						
					 
					
						2018-06-16 10:23:11 +02:00 
						 
				 
			
				
					
						
							
							
								Omar Cornut 
							
						 
					 
					
						
						
							
						
						a402edb66c 
					 
					
						
						
							
							Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. ( #1873 )  
						
						
						
						
					 
					
						2018-06-15 23:01:26 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						185b4dde87 
					 
					
						
						
							
							Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end.  
						
						
						
						
					 
					
						2018-06-13 19:22:47 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						be4b8b5615 
					 
					
						
						
							
							Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.  
						
						
						
						
					 
					
						2018-06-13 00:02:19 +02:00 
						 
				 
			
				
					
						
							
							
								Omar Cornut 
							
						 
					 
					
						
						
							
						
						e54b61aa0f 
					 
					
						
						
							
							Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. ( #1873 )  
						
						
						
						
					 
					
						2018-06-11 21:07:14 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f96c7fac91 
					 
					
						
						
							
							Examples: FreeGLUT: Fixed mapping of Space key. ( #801 )  
						
						
						
						
					 
					
						2018-06-11 20:03:35 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cdf51cad2d 
					 
					
						
						
							
							Comments, documentation  
						
						
						
						
					 
					
						2018-06-11 19:52:40 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a1b6766d43 
					 
					
						
						
							
							Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. ( #801 )  
						
						
						
						
					 
					
						2018-06-11 19:27:57 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bdb3d72d37 
					 
					
						
						
							
							Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). ( #1874 )  
						
						
						
						
					 
					
						2018-06-11 17:36:18 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7acb46bec5 
					 
					
						
						
							
							Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible ( #1027 ). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.  
						
						
						
						
					 
					
						2018-06-11 12:33:51 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						fac0c801da 
					 
					
						
						
							
							Examples: Added imgui_impl_osx.mm bindings ( #1870 ,  #281 )  
						
						
						
						
					 
					
						2018-06-11 10:19:17 +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 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						85f9694bd4 
					 
					
						
						
							
							Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )  
						
						... 
						
						
						
						Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead) 
						
						
					 
					
						2018-06-08 19:37:33 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						929522febe 
					 
					
						
						
							
							Missing examples changelog bits and todo list  
						
						
						
						
					 
					
						2018-05-25 12:51:24 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								daniel-murray 
							
						 
					 
					
						
						
							
						
						83d97d4a9b 
					 
					
						
						
							
							Fix typos KeyDown => KeysDown  
						
						
						
						
					 
					
						2018-04-14 10:28:10 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						664ab85f76 
					 
					
						
						
							
							Examples: Tweak comments. ( #1704 ,  #1708 ).  
						
						
						
						
					 
					
						2018-04-02 17:31:51 +02:00