Browse code Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_demo.cpp # imgui_internal.h docking
commit e32256b4b413ce37ebc37d6f42c924f6d6ee9119 2 parents 6d91055 + 132d8c5 omar authored on 14 Sep 2018

Showing 58 changed files

• docs/CHANGELOG.txt
• examples/README.txt
• examples/example_allegro5/main.cpp
• examples/example_apple_metal/Shared/ViewController.mm
• examples/example_apple_opengl2/main.mm
• examples/example_freeglut_opengl2/main.cpp
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_glfw_vulkan/CMakeLists.txt
• examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
• examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters
• examples/example_glfw_vulkan/main.cpp
• examples/example_marmalade/main.cpp
• examples/example_null/main.cpp
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx10/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/example_win32_directx9/main.cpp
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_allegro5.h
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx10.h
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx11.h
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_dx12.h
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_dx9.h
• examples/imgui_impl_freeglut.cpp
• examples/imgui_impl_freeglut.h
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_marmalade.h
• examples/imgui_impl_metal.h
• examples/imgui_impl_metal.mm
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl2.h
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_osx.h
• examples/imgui_impl_osx.mm
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• examples/imgui_impl_win32.cpp
• examples/imgui_impl_win32.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/README.txt

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

Ignore Space Show notes View examples/example_apple_metal/Shared/ViewController.mm

Ignore Space Show notes View examples/example_apple_opengl2/main.mm

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_allegro5.h

Ignore Space Show notes View examples/imgui_impl_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_dx10.h

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.h

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.h

Ignore Space Show notes View examples/imgui_impl_dx9.cpp

Ignore Space Show notes View examples/imgui_impl_dx9.h

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp

Ignore Space Show notes View examples/imgui_impl_freeglut.h

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.h

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_marmalade.h

Ignore Space Show notes View examples/imgui_impl_metal.h

Ignore Space Show notes View examples/imgui_impl_metal.mm

Ignore Space Show notes View examples/imgui_impl_opengl2.cpp

Ignore Space Show notes View examples/imgui_impl_opengl2.h

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.h

Ignore Space Show notes View examples/imgui_impl_osx.h

Ignore Space Show notes View examples/imgui_impl_osx.mm

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.h

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Ignore Space Show notes View examples/imgui_impl_win32.cpp

Ignore Space Show notes View examples/imgui_impl_win32.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 imgui_widgets.cpp

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below