Commit Graph

11 Commits (0f1c21a6c99f94128f0e5550174be48a19539aa3)

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
omar 1afd29d382 Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
omar 9cc63ba279 Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. ()
omar 9824bf1ba1 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
Marcel Smit faa7dad537 Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. ()
omar 6277781e83 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
Omar Cornut c3f9220c15 Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
omar deb7aa29cd OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. ()
Omar Cornut a402edb66c Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. ()
Omar Cornut e54b61aa0f Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. ()
omar fac0c801da Examples: Added imgui_impl_osx.mm bindings (, )