114 Commits (d4fc525614eada62c61b6ba965b08021647d674b)

Author	SHA1	Message	Date
omar	f5528001f6	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # imgui.cpp # imgui_internal.h	5 years ago
omar	4d4e3b97f4	TODO, Readme ... (dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)	5 years ago
omar	3fe6ae9732	Internals: Move some Nav functions and members around (no functional change) + Misc comments	5 years ago
omar	44174b1fa1	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h	5 years ago
omar	ff5299e0e0	Docs: FAQ, Comments.	5 years ago
omar	861f786d81	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp	5 years ago
Rokas Kupstys	5e2329b98e	Backends: GL3: Implement glbinding opengl loader support. (#2870)	5 years ago
omar	992736dc5d	Merge branch 'refs/heads/master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	5 years ago
omar	abaf0256b8	Version 1.75 WIP ... Added message to font file loading assert.	5 years ago
omar	813e0c18e6	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx12.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h	5 years ago
omar	bdce833636	Version 1.74	5 years ago
omar	0cbb96895a	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx12.cpp # imgui.cpp # imgui.h # imgui_widgets.cpp	5 years ago
omar	048b73dfaa	Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.	5 years ago
omar	e0c0e53edf	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	5 years ago
omar	c262276988	Version 1.74 WIP	5 years ago
omar	6994bf10bc	Merge branch 'master' into docking + fix for RenderMouseCursor() ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h	5 years ago
omar	d5efe16157	Version 1.73	5 years ago
omar	aedcd2fb1a	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx11.cpp # imgui.cpp	5 years ago
omar	f624455d7b	Version 1.73 WIP	5 years ago
omar	b8d8355f10	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	5 years ago
omar	6a0d0dab5a	Version 1.72b (patch for nav)	5 years ago
omar	9183e7c426	Version 1.73 WIP	5 years ago
omar	a1164399b0	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	5 years ago
omar	ecb9b1e2eb	Version 1.72	5 years ago
omar	e2c1f0a7cd	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	5 years ago
omar	516c3dee80	Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)	5 years ago
omar	b27fd87177	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h	5 years ago
omar	5286ecb8a7	Version 1.72 WIP	5 years ago
omar	d3d998a885	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/README.txt # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp	5 years ago
omar	2da1c66d15	Version 1.71 + comments	5 years ago
omar	4597632662	Readme, comments, dear imgui prefixes	5 years ago
omar	835a8b2c9b	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	5 years ago
omar	42fc563fed	Version 1.71 WIP + fixed minor typo	6 years ago
omar	d1d5075b66	Version 1.70	6 years ago
omar	76e61958fd	Merge branch 'master' into docking ... # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	6 years ago
omar	6c196cf432	Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.	6 years ago
omar	b89202824e	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_sdl.cpp	6 years ago
omar	c1848b185c	Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)	6 years ago
omar	43a85dd02e	Merge branch 'master' into docking	6 years ago
omar	cdb109f617	Renamed freeglut vcxproj files + Comments, Changelog (#2465)	6 years ago
Andrew Willmott	ece322ff12	freeglut -> glut rename	6 years ago
omar	9350158d61	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	6 years ago
omar	cf2c52282d	Version 1.70 WIP	6 years ago
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	6 years ago
omar	55c02099c5	Version 1.69, comments, typos	6 years ago
omar	49eb5f0280	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp	6 years ago
omar	9d1a392d7d	Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)	6 years ago
omar	cb9a6b8a8b	Merge branch 'master' into viewport ... # Conflicts: # examples/README.txt # imgui.cpp	6 years ago
omar	54ba8a643e	Removed trailing spaces from text files. (#2038, #2299)	6 years ago
omar	82e31d34f0	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp	6 years ago