Browse code Merge 'ocornut/master' into 'jdmo3/master' 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 f72b95d73f34b8206d664118bd4e151c3bb4d3c1 2 parents 30954b4 + 3dd3d0b Jefferson Montgomery authored on 24 Sep 2017 Jefferson Montgomery committed on 24 Sep 2017

Showing 48 changed files

• .travis.yml
• LICENSE
• LICENSE.txt
• README.md
• TODO.txt
• examples/.gitignore
• examples/README.txt
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/allegro5_example/main.cpp
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx10_example/main.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/main.cpp
• examples/directx12_example/directx12_example.vcxproj
• examples/directx12_example/imgui_impl_dx12.cpp
• examples/directx12_example/main.cpp
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/main.cpp
• examples/marmalade_example/main.cpp
• examples/opengl2_example/Makefile
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/imgui_impl_glfw.h
• examples/opengl2_example/main.cpp
• examples/opengl3_example/Makefile
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/build_win32.bat
• 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/Makefile
• examples/sdl_opengl3_example/build_win32.bat
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/build_win32.bat
• examples/vulkan_example/build_win64.bat
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• examples/vulkan_example/main.cpp
• extra_fonts/README.txt
• extra_fonts/binary_to_compressed_c.cpp
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View .travis.yml

Show notes View LICENSE 100644 → 0

Ignore Space Show notes View LICENSE.txt 0 → 100644

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View examples/directx12_example/imgui_impl_dx12.cpp

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

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

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

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

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.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/main.cpp

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View extra_fonts/README.txt

Ignore Space Show notes View extra_fonts/binary_to_compressed_c.cpp

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

Show line notes below