omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
2018-11-30 18:24:43 +01:00 |
|
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
2018-11-30 18:18:15 +01:00 |
|
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
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
2018-09-13 16:50:13 +02:00 |
|
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. (#2078)
|
2018-09-11 22:00:57 +02:00 |
|
omar
|
9824bf1ba1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-07-31 12:12:56 +02:00 |
|
Marcel Smit
|
faa7dad537
|
Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. (#1978)
|
2018-07-30 14:15:24 +02:00 |
|
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 |
|
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 Cornut
|
a402edb66c
|
Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873)
|
2018-06-15 23:01:26 +02:00 |
|
Omar Cornut
|
e54b61aa0f
|
Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873)
|
2018-06-11 21:07:14 +02:00 |
|
omar
|
fac0c801da
|
Examples: Added imgui_impl_osx.mm bindings (#1870, #281)
|
2018-06-11 10:19:17 +02:00 |
|