Browse code Merge branch 'master' 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 f4cf972ea94c0486be43487673c6b6dfa5a9834a 2 parents ccb3db9 + 219e4fb ocornut authored on 27 Nov 2016

Showing 24 changed files

• README.md
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/README.md
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/gen_spv.sh
• examples/vulkan_example/glsl_shader.frag
• examples/vulkan_example/glsl_shader.vert
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• examples/vulkan_example/imgui_impl_glfw_vulkan.h
• examples/vulkan_example/main.cpp
• extra_fonts/binary_to_compressed_c.cpp
• imgui.cpp
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• stb_rect_pack.h
• stb_truetype.h

Ignore Space Show notes View README.md

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/opengl2_example/imgui_impl_glfw.cpp

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/README.md

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

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/gen_spv.sh

Ignore Space Show notes View examples/vulkan_example/glsl_shader.frag

Ignore Space Show notes View examples/vulkan_example/glsl_shader.vert

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 extra_fonts/binary_to_compressed_c.cpp

Ignore Space Show notes View imgui.cpp

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 stb_rect_pack.h

Ignore Space Show notes View stb_truetype.h

Show line notes below