Browse code Merge remote-tracking branch 'origin' into 2016-02-colorpicker 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 v1.53 v1.52 v1.51
commit 1b5bbf725b4c9472f4ac1adf28fd0382259210a1 2 parents ef10b98 + 35c6fd6 ocornut authored on 25 Sep 2016

Showing 45 changed files

• .travis.yml
• README.md
• examples/.gitignore
• examples/README.txt
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/apple_example/imguiex.xcodeproj/project.pbxproj
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/imgui_examples_msvc2010.sln
• examples/marmalade_example/imgui_impl_marmalade.cpp
• examples/opengl2_example/Makefile
• examples/opengl2_example/build_win32.bat
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/imgui_impl_glfw.h
• 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/opengl_example/Makefile
• examples/opengl_example/build_win32.bat
• examples/opengl_example/imgui_impl_glfw.cpp
• examples/opengl_example/imgui_impl_glfw.h
• examples/opengl_example/main.cpp
• examples/opengl_example/opengl_example.vcxproj
• examples/opengl_example/opengl_example.vcxproj.filters
• examples/sdl_opengl2_example/README.md
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.h
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl_example/README.md
• examples/sdl_opengl_example/imgui_impl_sdl.cpp
• examples/sdl_opengl_example/imgui_impl_sdl.h
• examples/sdl_opengl_example/main.cpp
• examples/vulkan_example/CMakeLists.txt
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• extra_fonts/binary_to_compressed_c.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/README.txt

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

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/imgui_impl_dx10.cpp

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

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

Ignore Space Show notes View examples/imgui_examples_msvc2010.sln

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

Ignore Space Show notes View examples/opengl2_example/Makefile 0 → 100644

Ignore Space Show notes View examples/opengl2_example/build_win32.bat 0 → 100644

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.cpp 0 → 100644

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.h 0 → 100644

Ignore Space Show notes View examples/opengl2_example/main.cpp 0 → 100644

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj 0 → 100644

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/opengl3_example/Makefile

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

Show notes View examples/opengl_example/Makefile 100644 → 0

Show notes View examples/opengl_example/build_win32.bat 100644 → 0

Show notes View examples/opengl_example/imgui_impl_glfw.cpp 100644 → 0

Show notes View examples/opengl_example/imgui_impl_glfw.h 100644 → 0

Show notes View examples/opengl_example/main.cpp 100644 → 0

Show notes View examples/opengl_example/opengl_example.vcxproj 100644 → 0

Show notes View examples/opengl_example/opengl_example.vcxproj.filters 100644 → 0

Ignore Space Show notes View examples/sdl_opengl2_example/README.md 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.cpp 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.h 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/main.cpp 0 → 100644

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

Show notes View examples/sdl_opengl_example/README.md 100644 → 0

Show notes View examples/sdl_opengl_example/imgui_impl_sdl.cpp 100644 → 0

Show notes View examples/sdl_opengl_example/imgui_impl_sdl.h 100644 → 0

Show notes View examples/sdl_opengl_example/main.cpp 100644 → 0

Ignore Space Show notes View examples/vulkan_example/CMakeLists.txt

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

Ignore Space Show notes View extra_fonts/binary_to_compressed_c.cpp

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

Show line notes below