omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
7 years ago |
|
Omar Cornut
|
c3f9220c15
|
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
|
7 years ago |
|
omar
|
deb7aa29cd
|
OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873)
|
7 years ago |
|
Omar Cornut
|
a402edb66c
|
Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873)
|
7 years ago |
|
Omar Cornut
|
e54b61aa0f
|
Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873)
|
7 years ago |
|
omar
|
fac0c801da
|
Examples: Added imgui_impl_osx.mm bindings (#1870, #281)
|
7 years ago |