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 77177c18f0cc2e9e22402ced003c183cc61f9dc3 2 parents 4c1d423 + 1588eda ocornut authored on 9 Apr 2016

Showing 73 changed files

• examples/README.txt
• examples/apple_example/.gitignore
• examples/apple_example/README.md
• examples/apple_example/imguiex-ios/AppDelegate.h
• examples/apple_example/imguiex-ios/AppDelegate.m
• examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib
• examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard
• examples/apple_example/imguiex-ios/GameViewController.h
• examples/apple_example/imguiex-ios/GameViewController.m
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
• examples/apple_example/imguiex-ios/Info.plist
• examples/apple_example/imguiex-ios/Shaders/Shader.fsh
• examples/apple_example/imguiex-ios/Shaders/Shader.vsh
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/debug_hud.h
• examples/apple_example/imguiex-ios/imgui_ex_icon.png
• examples/apple_example/imguiex-ios/imgui_impl_ios.h
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/apple_example/imguiex-ios/main.m
• examples/apple_example/imguiex-osx/AppDelegate.h
• examples/apple_example/imguiex-osx/AppDelegate.m
• examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json
• examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png
• examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json
• examples/apple_example/imguiex-osx/Info.plist
• examples/apple_example/imguiex-osx/main.m
• examples/apple_example/imguiex.xcodeproj/project.pbxproj
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/ios_example/.gitignore
• examples/ios_example/README.md
• examples/ios_example/imguiex.xcodeproj/project.pbxproj
• examples/ios_example/imguiex/AppDelegate.h
• examples/ios_example/imguiex/AppDelegate.m
• examples/ios_example/imguiex/Base.lproj/LaunchScreen.xib
• examples/ios_example/imguiex/Base.lproj/Main.storyboard
• examples/ios_example/imguiex/GameViewController.h
• examples/ios_example/imguiex/GameViewController.m
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/Contents.json
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
• examples/ios_example/imguiex/Info.plist
• examples/ios_example/imguiex/Shaders/Shader.fsh
• examples/ios_example/imguiex/Shaders/Shader.vsh
• examples/ios_example/imguiex/debug_hud.cpp
• examples/ios_example/imguiex/debug_hud.h
• examples/ios_example/imguiex/imgui_ex_icon.png
• examples/ios_example/imguiex/imgui_impl_ios.h
• examples/ios_example/imguiex/imgui_impl_ios.mm
• examples/ios_example/imguiex/main.m
• examples/libs/glfw/include/GLFW/glfw3.h
• examples/libs/glfw/include/GLFW/glfw3native.h
• examples/libs/glfw/lib-vc2010-32/glfw3.lib
• examples/libs/glfw/lib-vc2010-64/glfw3.lib
• examples/vulkan_example/CMakeLists.txt
• examples/vulkan_example/build_win32.bat
• 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
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/apple_example/.gitignore 0 → 100644

Ignore Space Show notes View examples/apple_example/README.md 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/AppDelegate.h 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/AppDelegate.m 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.h 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.m 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Info.plist 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Shaders/Shader.fsh 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/Shaders/Shader.vsh 0 → 100644

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

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.h 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_ex_icon.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_impl_ios.h 0 → 100644

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

Ignore Space Show notes View examples/apple_example/imguiex-ios/main.m 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/AppDelegate.h 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/AppDelegate.m 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/Info.plist 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex-osx/main.m 0 → 100644

Ignore Space Show notes View examples/apple_example/imguiex.xcodeproj/project.pbxproj 0 → 100644

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

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

Show notes View examples/ios_example/.gitignore 100644 → 0

Show notes View examples/ios_example/README.md 100644 → 0

Show notes View examples/ios_example/imguiex.xcodeproj/project.pbxproj 100644 → 0

Show notes View examples/ios_example/imguiex/AppDelegate.h 100644 → 0

Show notes View examples/ios_example/imguiex/AppDelegate.m 100644 → 0

Show notes View examples/ios_example/imguiex/Base.lproj/LaunchScreen.xib 100644 → 0

Show notes View examples/ios_example/imguiex/Base.lproj/Main.storyboard 100644 → 0

Show notes View examples/ios_example/imguiex/GameViewController.h 100644 → 0

Show notes View examples/ios_example/imguiex/GameViewController.m 100644 → 0

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/Contents.json 100644 → 0

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 100644 → 0

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 100644 → 0

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 100644 → 0

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 100644 → 0

Show notes View examples/ios_example/imguiex/Info.plist 100644 → 0

Show notes View examples/ios_example/imguiex/Shaders/Shader.fsh 100644 → 0

Show notes View examples/ios_example/imguiex/Shaders/Shader.vsh 100644 → 0

Show notes View examples/ios_example/imguiex/debug_hud.cpp 100644 → 0

Show notes View examples/ios_example/imguiex/debug_hud.h 100644 → 0

Show notes View examples/ios_example/imguiex/imgui_ex_icon.png 100644 → 0

Show notes View examples/ios_example/imguiex/imgui_impl_ios.h 100644 → 0

Show notes View examples/ios_example/imguiex/imgui_impl_ios.mm 100644 → 0

Show notes View examples/ios_example/imguiex/main.m 100644 → 0

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3.h

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3native.h

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-32/glfw3.lib
Not supported

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-64/glfw3.lib
Not supported

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

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

Ignore Space Show notes View examples/vulkan_example/gen_spv.sh 0 → 100755

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

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

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

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

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

Show line notes below