5 Commits

Author	SHA1	Message	Date
omar	6277781e83	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-08 13:08:16 +02:00
Omar Cornut	c3f9220c15	Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments	2018-07-08 10:47:31 +02:00
Warren Moore	d64157e803	Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873)	2018-07-05 21:58:15 +09:00
omar	deb7aa29cd	OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873)	2018-07-04 13:24:16 +02:00
omar	fac0c801da	Examples: Added imgui_impl_osx.mm bindings (#1870, #281)	2018-06-11 10:19:17 +02:00