omar
							
						 
					 | 
					
						
						
							
						
						6bf981c85c
					 | 
					
						
						
							
							Vulkan: More renaming. Comments.
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:20:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f586764cdd
					 | 
					
						
						
							
							Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:12:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						54b8a65d9e
					 | 
					
						
						
							
							Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:12:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						317859a3da
					 | 
					
						
						
							
							Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:11:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c7eef99a33
					 | 
					
						
						
							
							Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:10:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MindSpunk
							
						 
					 | 
					
						
						
							
						
						b88a3b2711
					 | 
					
						
						
							
							Examples: Vulkan: Added calls to supports runtime changing back buffer count. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:10:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						43a85dd02e
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:10:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1c3311e4d6
					 | 
					
						
						
							
							Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:09:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fc52364652
					 | 
					
						
						
							
							Tabs to Spaces, comments.
						
						
						
						
						
						
					 | 
					
						2019-04-03 17:25:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cdb109f617
					 | 
					
						
						
							
							Renamed freeglut vcxproj files + Comments, Changelog (#2465)
						
						
						
						
						
						
					 | 
					
						2019-04-03 16:25:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Willmott
							
						 
					 | 
					
						
						
							
						
						ece322ff12
					 | 
					
						
						
							
							freeglut -> glut rename
						
						
						
						
						
						
					 | 
					
						2019-04-03 07:19:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Willmott
							
						 
					 | 
					
						
						
							
						
						3fad375f5f
					 | 
					
						
						
							
							ifdef freeglut extensions properly
						
						
						
						
						
						
					 | 
					
						2019-04-03 07:19:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Willmott
							
						 
					 | 
					
						
						
							
						
						81f70e5b7c
					 | 
					
						
						
							
							Fixups for OSX
						
						
						
						
						
						
					 | 
					
						2019-04-03 07:19:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Willmott
							
						 
					 | 
					
						
						
							
						
						a402f5b9a9
					 | 
					
						
						
							
							Add makefile for freeglut
						
						
						
						
						
						
					 | 
					
						2019-04-03 07:19:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5c4cc370bb
					 | 
					
						
						
							
							Examples: Vulkan: Added shader sources/references in the .cpp source.
						
						
						
						
						
						
					 | 
					
						2019-04-03 11:23:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						49fb8e6c45
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp 
						
						
					 | 
					
						2019-04-03 11:17:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						da035ced97
					 | 
					
						
						
							
							InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467)
						
						
						
						
						
						
						
						+ Fix some output filename in SDL build batch files. 
						
						
					 | 
					
						2019-04-03 11:04:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e3cd6b1cbb
					 | 
					
						
						
							
							Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
						
						
						
						
						
						
					 | 
					
						2019-04-02 15:34:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3a737e665a
					 | 
					
						
						
							
							Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
						
						
						
						
						
						
					 | 
					
						2019-04-02 10:36:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e21bbee311
					 | 
					
						
						
							
							Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454)
						
						
						
						
						
						
					 | 
					
						2019-03-29 18:32:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						163779da51
					 | 
					
						
						
							
							Examples: DirectX12: Various tidying up.
						
						
						
						
						
						
					 | 
					
						2019-03-29 16:23:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						512d39d031
					 | 
					
						
						
							
							Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
						
						
						
						
						
						
					 | 
					
						2019-03-29 16:17:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a33d45d7cd
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp 
						
						
					 | 
					
						2019-03-28 15:48:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						20188b19d6
					 | 
					
						
						
							
							Comments (#2441) + Freeglut fixes (#2430)
						
						
						
						
						
						
					 | 
					
						2019-03-26 12:16:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9350158d61
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2019-03-25 16:08:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						221bf93a55
					 | 
					
						
						
							
							Comments, todo list, remove trailing spaces.
						
						
						
						
						
						
					 | 
					
						2019-03-17 00:56:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ff03ae503b
					 | 
					
						
						
							
							Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421)
						
						
						
						
						
						
					 | 
					
						2019-03-15 13:09:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cf2c52282d
					 | 
					
						
						
							
							Version 1.70 WIP
						
						
						
						
						
						
					 | 
					
						2019-03-15 13:07:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b1af4d36ce
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp 
						
						
					 | 
					
						2019-03-13 15:30:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						55c02099c5
					 | 
					
						
						
							
							Version 1.69, comments, typos
						
						
						
						
						
						
					 | 
					
						2019-03-13 15:29:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a26085ed53
					 | 
					
						
						
							
							Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
						
						
						
						
						
						
					 | 
					
						2019-03-12 22:23:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9afb849e16
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp 
						
						
					 | 
					
						2019-03-12 18:28:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cfa8f672f6
					 | 
					
						
						
							
							Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) (#2416)
						
						
						
						
						
						
					 | 
					
						2019-03-12 18:27:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f7db4fad31
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp 
						
						
					 | 
					
						2019-03-11 16:08:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6767b0a1b0
					 | 
					
						
						
							
							Examples: Win32+DirectX: moved helper functions below main.
						
						
						
						
						
						
					 | 
					
						2019-03-11 16:00:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3eedb542a6
					 | 
					
						
						
							
							Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
						
						
						
						
						
						
					 | 
					
						2019-03-11 11:07:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bruce Mitchener
							
						 
					 | 
					
						
						
							
						
						b5d57a6615
					 | 
					
						
						
							
							Fix typos. (#2413)
						
						
						
						
						
						
					 | 
					
						2019-03-09 10:10:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gilad Reich
							
						 
					 | 
					
						
						
							
						
						0a6c5bc234
					 | 
					
						
						
							
							Examples: DirectX9: Added support for multi-viewport (#2394)
						
						
						
						
						
						
					 | 
					
						2019-03-06 21:36:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e91d275b10
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui_demo.cpp 
						
						
					 | 
					
						2019-03-06 21:18:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						510342f024
					 | 
					
						
						
							
							Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
						
						
						
						
						
						
					 | 
					
						2019-03-06 18:00:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						49eb5f0280
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl3.cpp 
						
						
					 | 
					
						2019-03-03 23:34:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						beb3062dc5
					 | 
					
						
						
							
							Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
						
						
						
						
						
						
					 | 
					
						2019-03-03 23:34:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9d1a392d7d
					 | 
					
						
						
							
							Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)
						
						
						
						
						
						
					 | 
					
						2019-03-03 23:25:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Richard Mitton
							
						 
					 | 
					
						
						
							
						
						7a536f1bd2
					 | 
					
						
						
							
							Examples + Viewport: GLFW: context wasn't set when using multiple windows. (#2392)
						
						
						
						
						
						
					 | 
					
						2019-03-03 23:01:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ff0c6c2bde
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2019-02-27 19:00:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						75641926e1
					 | 
					
						
						
							
							Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_allegro5.cpp 
						
						
					 | 
					
						2019-02-27 14:39:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						87ded34f9f
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp 
						
						
					 | 
					
						2019-02-22 12:29:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2068dd509c
					 | 
					
						
						
							
							Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. (#2366, #2186)
						
						
						
						
						
						
					 | 
					
						2019-02-20 14:31:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d0c98bf880
					 | 
					
						
						
							
							Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
						
						
						
						
						
						
					 | 
					
						2019-02-19 20:13:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ff0f9aa856
					 | 
					
						
						
							
							Comments for Linux/Mac (#2117)
						
						
						
						
						
						
					 | 
					
						2019-02-19 16:36:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |