Merge branch 'master' into viewport
# Conflicts: # examples/imgui_impl_sdl.cpp |
---|
CHANGELOG.txt |
---|
Too large
|
examples/.gitignore |
---|
Too large
|
examples/README.txt |
---|
Too large
|
examples/allegro5_example/README.md 100644 → 0 |
---|
Too large
|
examples/allegro5_example/imconfig_allegro5.h 100644 → 0 |
---|
Too large
|
examples/allegro5_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/apple_example/.gitignore 100644 → 0 |
---|
Too large
|
examples/apple_example/README.md 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/AppDelegate.h 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/AppDelegate.m 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/GameViewController.h 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/GameViewController.m 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Info.plist 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Shaders/Shader.fsh 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/Shaders/Shader.vsh 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/debug_hud.cpp 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/debug_hud.h 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/imgui_ex_icon.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/imgui_impl_ios.h 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/imgui_impl_ios.mm 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-ios/main.m 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/AppDelegate.h 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/AppDelegate.m 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/Info.plist 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex-osx/main.m 100644 → 0 |
---|
Too large
|
examples/apple_example/imguiex.xcodeproj/project.pbxproj 100644 → 0 |
---|
Too large
|
examples/directx10_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/directx10_example/directx10_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/directx10_example/directx10_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/directx10_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/directx11_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/directx11_example/directx11_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/directx11_example/directx11_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/directx11_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/directx12_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/directx12_example/directx12_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/directx12_example/directx12_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/directx12_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/directx9_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/directx9_example/directx9_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/directx9_example/directx9_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/directx9_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/example_allegro5/README.md 0 → 100644 |
---|
Too large
|
examples/example_allegro5/imconfig_allegro5.h 0 → 100644 |
---|
Too large
|
examples/example_allegro5/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_apple/.gitignore 0 → 100644 |
---|
Too large
|
examples/example_apple/README.md 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/AppDelegate.h 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/AppDelegate.m 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/GameViewController.h 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/GameViewController.m 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Info.plist 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Shaders/Shader.fsh 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/Shaders/Shader.vsh 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/debug_hud.cpp 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/debug_hud.h 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/imgui_ex_icon.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/imgui_impl_ios.h 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/imgui_impl_ios.mm 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-ios/main.m 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/AppDelegate.h 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/AppDelegate.m 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/Info.plist 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex-osx/main.m 0 → 100644 |
---|
Too large
|
examples/example_apple/imguiex.xcodeproj/project.pbxproj 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl2/Makefile 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl2/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl2/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl3/Makefile 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl3/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_glfw_opengl3/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/CMakeLists.txt 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/build_win64.bat 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/gen_spv.sh 0 → 100755 |
---|
Too large
|
examples/example_glfw_vulkan/glsl_shader.frag 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/glsl_shader.vert 0 → 100644 |
---|
Too large
|
examples/example_glfw_vulkan/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_marmalade/data/app.icf 0 → 100644 |
---|
Too large
|
examples/example_marmalade/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_marmalade/marmalade_example.mkb 0 → 100644 |
---|
Too large
|
examples/example_null/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_null/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/Makefile 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/README.md 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl2/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/Makefile 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/README.md 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_sdl_opengl3/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_sdl_vulkan/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_win32_directx10/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_win32_directx10/example_win32_directx10.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_win32_directx10/example_win32_directx10.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_win32_directx10/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_win32_directx11/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_win32_directx11/example_win32_directx11.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_win32_directx11/example_win32_directx11.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_win32_directx11/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_win32_directx12/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_win32_directx12/example_win32_directx12.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_win32_directx12/example_win32_directx12.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_win32_directx12/main.cpp 0 → 100644 |
---|
Too large
|
examples/example_win32_directx9/build_win32.bat 0 → 100644 |
---|
Too large
|
examples/example_win32_directx9/example_win32_directx9.vcxproj 0 → 100644 |
---|
Too large
|
examples/example_win32_directx9/example_win32_directx9.vcxproj.filters 0 → 100644 |
---|
Too large
|
examples/example_win32_directx9/main.cpp 0 → 100644 |
---|
Too large
|
examples/imgui_examples.sln |
---|
Too large
|
examples/imgui_impl_sdl.cpp 0 → 100644 |
---|
Too large
|
examples/imgui_impl_sdl.h 0 → 100644 |
---|
Too large
|
examples/imgui_impl_sdl2.cpp 100644 → 0 |
---|
Too large
|
examples/imgui_impl_sdl2.h 100644 → 0 |
---|
Too large
|
examples/marmalade_example/data/app.icf 100644 → 0 |
---|
Too large
|
examples/marmalade_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/marmalade_example/marmalade_example.mkb 100644 → 0 |
---|
Too large
|
examples/null_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/null_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/opengl2_example/Makefile 100644 → 0 |
---|
Too large
|
examples/opengl2_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/opengl2_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/opengl2_example/opengl2_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/opengl2_example/opengl2_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/opengl3_example/Makefile 100644 → 0 |
---|
Too large
|
examples/opengl3_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/opengl3_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/opengl3_example/opengl3_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/opengl3_example/opengl3_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/Makefile 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/README.md 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/Makefile 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/README.md 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/sdl_vulkan_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
examples/vulkan_example/CMakeLists.txt 100644 → 0 |
---|
Too large
|
examples/vulkan_example/build_win32.bat 100644 → 0 |
---|
Too large
|
examples/vulkan_example/build_win64.bat 100644 → 0 |
---|
Too large
|
examples/vulkan_example/gen_spv.sh 100755 → 0 |
---|
Too large
|
examples/vulkan_example/glsl_shader.frag 100644 → 0 |
---|
Too large
|
examples/vulkan_example/glsl_shader.vert 100644 → 0 |
---|
Too large
|
examples/vulkan_example/main.cpp 100644 → 0 |
---|
Too large
|
examples/vulkan_example/vulkan_example.vcxproj 100644 → 0 |
---|
Too large
|
examples/vulkan_example/vulkan_example.vcxproj.filters 100644 → 0 |
---|
Too large
|
imgui.h |
---|
Too large
|
imgui_draw.cpp |
---|
Too large
|
misc/fonts/README.txt |
---|
Too large
|
misc/freetype/imgui_freetype.cpp |
---|
Too large
|