Browse code Merge branch 'master' into context docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60
commit 27980d9688ec46c7371263b1594ec0c1c465117c 2 parents f377605 + cd3dd88 omar authored on 31 Jan 2018

Showing 67 changed files

• TODO.txt
• examples/.gitignore
• examples/allegro5_example/README.md
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/allegro5_example/main.cpp
• examples/apple_example/imguiex-ios/GameViewController.m
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/debug_hud.h
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/apple_example/imguiex.xcodeproj/project.pbxproj
• examples/directx10_example/directx10_example.vcxproj
• examples/directx10_example/directx10_example.vcxproj.filters
• examples/directx10_example/main.cpp
• examples/directx11_example/directx11_example.vcxproj
• examples/directx11_example/directx11_example.vcxproj.filters
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/main.cpp
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/directx9_example.vcxproj.filters
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/main.cpp
• examples/libs/imgui.natvis
• examples/libs/usynergy/README.txt
• examples/marmalade_example/imgui_impl_marmalade.cpp
• examples/marmalade_example/main.cpp
• examples/null_example/main.cpp
• examples/opengl2_example/Makefile
• examples/opengl2_example/imgui_impl_glfw_gl2.cpp
• examples/opengl2_example/main.cpp
• examples/opengl2_example/opengl2_example.vcxproj
• examples/opengl2_example/opengl2_example.vcxproj.filters
• examples/opengl3_example/Makefile
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/main.cpp
• examples/opengl3_example/opengl3_example.vcxproj
• examples/opengl3_example/opengl3_example.vcxproj.filters
• examples/sdl_opengl2_example/README.md
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/Makefile
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• examples/vulkan_example/main.cpp
• extra_fonts/Cousine-Regular.ttf
• extra_fonts/DroidSans.ttf
• extra_fonts/Karla-Regular.ttf
• extra_fonts/ProggyClean.ttf
• extra_fonts/ProggyTiny.ttf
• extra_fonts/README.txt
• extra_fonts/Roboto-Medium.ttf
• extra_fonts/binary_to_compressed_c.cpp
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/fonts/Cousine-Regular.ttf
• misc/fonts/DroidSans.ttf
• misc/fonts/Karla-Regular.ttf
• misc/fonts/ProggyClean.ttf
• misc/fonts/ProggyTiny.ttf
• misc/fonts/README.txt
• misc/fonts/Roboto-Medium.ttf
• misc/fonts/binary_to_compressed_c.cpp
• misc/natvis/README.txt
• misc/natvis/imgui.natvis

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/allegro5_example/README.md

Ignore Space Show notes View examples/allegro5_example/imgui_impl_a5.cpp

Ignore Space Show notes View examples/allegro5_example/main.cpp

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.m

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.cpp

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.h

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_impl_ios.mm

Ignore Space Show notes View examples/apple_example/imguiex.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/directx10_example/directx10_example.vcxproj

Ignore Space Show notes View examples/directx10_example/directx10_example.vcxproj.filters

Ignore Space Show notes View examples/directx10_example/main.cpp

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj.filters

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/directx11_example/main.cpp

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj.filters

Ignore Space Show notes View examples/directx9_example/imgui_impl_dx9.cpp

Ignore Space Show notes View examples/directx9_example/main.cpp

Show notes View examples/libs/imgui.natvis 100644 → 0

Ignore Space Show notes View examples/libs/usynergy/README.txt 0 → 100644

Ignore Space Show notes View examples/marmalade_example/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/marmalade_example/main.cpp

Ignore Space Show notes View examples/null_example/main.cpp

Ignore Space Show notes View examples/opengl2_example/Makefile

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw_gl2.cpp

Ignore Space Show notes View examples/opengl2_example/main.cpp

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj.filters

Ignore Space Show notes View examples/opengl3_example/Makefile

Ignore Space Show notes View examples/opengl3_example/imgui_impl_glfw_gl3.cpp

Ignore Space Show notes View examples/opengl3_example/main.cpp

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj.filters

Ignore Space Show notes View examples/sdl_opengl2_example/README.md

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp

Ignore Space Show notes View examples/sdl_opengl2_example/main.cpp

Ignore Space Show notes View examples/sdl_opengl3_example/Makefile

Ignore Space Show notes View examples/sdl_opengl3_example/main.cpp

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.cpp

Ignore Space Show notes View examples/vulkan_example/main.cpp

Show notes View extra_fonts/Cousine-Regular.ttf 100644 → 0
Not supported

Show notes View extra_fonts/DroidSans.ttf 100644 → 0
Not supported

Show notes View extra_fonts/Karla-Regular.ttf 100644 → 0
Not supported

Show notes View extra_fonts/ProggyClean.ttf 100644 → 0
Not supported

Show notes View extra_fonts/ProggyTiny.ttf 100644 → 0
Not supported

Show notes View extra_fonts/README.txt 100644 → 0

Show notes View extra_fonts/Roboto-Medium.ttf 100644 → 0
Not supported

Show notes View extra_fonts/binary_to_compressed_c.cpp 100644 → 0

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View misc/fonts/Cousine-Regular.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/DroidSans.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/Karla-Regular.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/ProggyClean.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/ProggyTiny.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/README.txt 0 → 100644

Ignore Space Show notes View misc/fonts/Roboto-Medium.ttf 0 → 100644
Not supported

Ignore Space Show notes View misc/fonts/binary_to_compressed_c.cpp 0 → 100644

Ignore Space Show notes View misc/natvis/README.txt 0 → 100644

Ignore Space Show notes View misc/natvis/imgui.natvis 0 → 100644

Show line notes below