Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 6277781e837e7419686866a03e68a7d0e7eb85b0 2 parents 770cba0 + c790723 omar authored on 8 Jul 2018

Showing 83 changed files

• CHANGELOG.txt
• README.md
• examples/.gitignore
• examples/README.txt
• examples/example_apple/.gitignore
• examples/example_apple/README.md
• examples/example_apple/imguiex-ios/AppDelegate.h
• examples/example_apple/imguiex-ios/AppDelegate.m
• examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib
• examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard
• examples/example_apple/imguiex-ios/GameViewController.h
• examples/example_apple/imguiex-ios/GameViewController.m
• examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json
• examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
• examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
• examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
• examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
• examples/example_apple/imguiex-ios/Info.plist
• examples/example_apple/imguiex-ios/Shaders/Shader.fsh
• examples/example_apple/imguiex-ios/Shaders/Shader.vsh
• examples/example_apple/imguiex-ios/debug_hud.cpp
• examples/example_apple/imguiex-ios/debug_hud.h
• examples/example_apple/imguiex-ios/imgui_ex_icon.png
• examples/example_apple/imguiex-ios/imgui_impl_ios.h
• examples/example_apple/imguiex-ios/imgui_impl_ios.mm
• examples/example_apple/imguiex-ios/main.m
• examples/example_apple/imguiex-osx/AppDelegate.h
• examples/example_apple/imguiex-osx/AppDelegate.m
• examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json
• examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png
• examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json
• examples/example_apple/imguiex-osx/Info.plist
• examples/example_apple/imguiex-osx/main.m
• examples/example_apple/imguiex.xcodeproj/project.pbxproj
• examples/example_apple_metal/README.md
• examples/example_apple_metal/Shared/AppDelegate.h
• examples/example_apple_metal/Shared/AppDelegate.m
• examples/example_apple_metal/Shared/Renderer.h
• examples/example_apple_metal/Shared/Renderer.mm
• examples/example_apple_metal/Shared/ViewController.h
• examples/example_apple_metal/Shared/ViewController.mm
• examples/example_apple_metal/Shared/main.m
• examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
• examples/example_apple_metal/iOS/Base.lproj/Main.storyboard
• examples/example_apple_metal/iOS/Default-568h@2x.png
• examples/example_apple_metal/iOS/Info-iOS.plist
• examples/example_apple_metal/iOS/Launch Screen.storyboard
• examples/example_apple_metal/macOS/Base.lproj/Main.storyboard
• examples/example_apple_metal/macOS/Info-macOS.plist
• examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj
• examples/example_apple_opengl2/main.mm
• 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
• imgui.cpp
• imgui.h
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/README.txt

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

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

Show notes View examples/example_apple/imguiex-ios/AppDelegate.h 100644 → 0

Show notes View examples/example_apple/imguiex-ios/AppDelegate.m 100644 → 0

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

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

Show notes View examples/example_apple/imguiex-ios/GameViewController.h 100644 → 0

Show notes View examples/example_apple/imguiex-ios/GameViewController.m 100644 → 0

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

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

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

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

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

Show notes View examples/example_apple/imguiex-ios/Info.plist 100644 → 0

Show notes View examples/example_apple/imguiex-ios/Shaders/Shader.fsh 100644 → 0

Show notes View examples/example_apple/imguiex-ios/Shaders/Shader.vsh 100644 → 0

Show notes View examples/example_apple/imguiex-ios/debug_hud.cpp 100644 → 0

Show notes View examples/example_apple/imguiex-ios/debug_hud.h 100644 → 0

Show notes View examples/example_apple/imguiex-ios/imgui_ex_icon.png 100644 → 0

Show notes View examples/example_apple/imguiex-ios/imgui_impl_ios.h 100644 → 0

Show notes View examples/example_apple/imguiex-ios/imgui_impl_ios.mm 100644 → 0

Show notes View examples/example_apple/imguiex-ios/main.m 100644 → 0

Show notes View examples/example_apple/imguiex-osx/AppDelegate.h 100644 → 0

Show notes View examples/example_apple/imguiex-osx/AppDelegate.m 100644 → 0

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

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

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

Show notes View examples/example_apple/imguiex-osx/Info.plist 100644 → 0

Show notes View examples/example_apple/imguiex-osx/main.m 100644 → 0

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

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

Ignore Space Show notes View examples/example_apple_metal/Shared/AppDelegate.h 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/AppDelegate.m 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/Renderer.h 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/Renderer.mm 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/ViewController.h 0 → 100644

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

Ignore Space Show notes View examples/example_apple_metal/Shared/main.m 0 → 100644

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

Ignore Space Show notes View examples/example_apple_metal/iOS/Base.lproj/Main.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Default-568h@2x.png 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Info-iOS.plist 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Launch Screen.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/macOS/Base.lproj/Main.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/macOS/Info-macOS.plist 0 → 100644

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

Ignore Space Show notes View examples/example_apple_opengl2/main.mm 0 → 100644

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 0 → 100644

Ignore Space Show notes View examples/imgui_impl_metal.mm 0 → 100644

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 0 → 100644

Ignore Space Show notes View examples/imgui_impl_osx.mm 0 → 100644

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

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below