Browse code Merge branch 'master' into font_offset 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 a3d5f92214bb4aa73e265570365f8c0aef529af3 2 parents c433bbc + 1ef1acb omar authored on 8 Mar 2018

Showing 64 changed files

• .github/issue_template.md
• .travis.yml
• CHANGELOG.txt
• README.md
• TODO.txt
• examples/.gitignore
• examples/README.txt
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/allegro5_example/imgui_impl_a5.h
• examples/allegro5_example/main.cpp
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx10_example/imgui_impl_dx10.h
• examples/directx10_example/main.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/imgui_impl_dx11.h
• examples/directx11_example/main.cpp
• examples/directx12_example/build_win32.bat
• examples/directx12_example/directx12_example.vcxproj
• examples/directx12_example/directx12_example.vcxproj.filters
• examples/directx12_example/imgui_impl_dx12.cpp
• examples/directx12_example/imgui_impl_dx12.h
• examples/directx12_example/main.cpp
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/imgui_impl_dx9.h
• examples/directx9_example/main.cpp
• examples/imgui_examples.sln
• examples/imgui_examples_msvc2010.sln
• examples/marmalade_example/imgui_impl_marmalade.cpp
• examples/marmalade_example/imgui_impl_marmalade.h
• examples/marmalade_example/main.cpp
• examples/opengl2_example/Makefile
• examples/opengl2_example/imgui_impl_glfw_gl2.cpp
• examples/opengl2_example/imgui_impl_glfw_gl2.h
• examples/opengl2_example/main.cpp
• examples/opengl3_example/Makefile
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.h
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/Makefile
• examples/sdl_opengl2_example/build_win32.bat
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj
• examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj.filters
• examples/sdl_opengl3_example/Makefile
• examples/sdl_opengl3_example/build_win32.bat
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
• examples/sdl_opengl3_example/main.cpp
• examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj
• examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj.filters
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• examples/vulkan_example/imgui_impl_glfw_vulkan.h
• examples/vulkan_example/main.cpp
• examples/vulkan_example/vulkan_example.vcxproj
• examples/vulkan_example/vulkan_example.vcxproj.filters
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/freetype/imgui_freetype.cpp
• stb_truetype.h

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View CHANGELOG.txt 0 → 100644

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt

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/allegro5_example/imgui_impl_a5.h

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

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

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.h

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

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

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

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

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

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

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

Ignore Space Show notes View examples/directx12_example/imgui_impl_dx12.cpp 0 → 100644

Ignore Space Show notes View examples/directx12_example/imgui_impl_dx12.h 0 → 100644

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

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

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

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

Ignore Space Show notes View examples/imgui_examples.sln 0 → 100644

Show notes View examples/imgui_examples_msvc2010.sln 100644 → 0

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

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

Ignore Space Show notes View examples/marmalade_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/imgui_impl_glfw_gl2.h

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

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/imgui_impl_glfw_gl3.h

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

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

Ignore Space Show notes View examples/sdl_opengl2_example/build_win32.bat

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

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

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

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

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

Ignore Space Show notes View examples/sdl_opengl3_example/Makefile

Ignore Space Show notes View examples/sdl_opengl3_example/build_win32.bat

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

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

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

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

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

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

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

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

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

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

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/freetype/imgui_freetype.cpp

Ignore Space Show notes View stb_truetype.h

Show line notes below