8 Commits (85e1e2b0c8ce0c07015c0cb69fda41d5a194e07c)

Author	SHA1	Message	Date
omar	b85f345369	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp	7 years ago
omar	1afd29d382	Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.	7 years ago
omar	e5f2295398	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp	7 years ago
omar	421dc19798	Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015)	7 years ago
omar	6277781e83	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	7 years ago
omar	89e2ddf07f	Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx	7 years ago
Omar Cornut	c3f9220c15	Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments	7 years ago
Warren Moore	d64157e803	Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873)	7 years ago