omar
|
9ddb8493d5
|
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. (#2520, #2502)
|
6 years ago |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
d88121ff5b
|
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
|
6 years ago |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
6 years ago |
Max Thrun
|
5ecc9d5865
|
Examples: Metal: Add GLFW+Metal example
|
6 years ago |
ibachar
|
4f22a45cb5
|
Removed git merge leftovers
|
6 years ago |
|
omar
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
ae405b83a4
|
Examples: Added missing per-renderer local changelogs. (#2037, #1639, #2452)
|
6 years ago |
|
Max Thrun
|
7c6ba3a1da
|
ImDrawCallback_ResetRenderState: Added Metal.
|
6 years ago |
|
omar
|
5c1cd5c8c7
|
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
6 years ago |
|
omar
|
a649d904d7
|
Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494)
|
6 years ago |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
6 years ago |
|
omar
|
1ca6e5b59f
|
Examples: Glut: Added note about missing cursor support. (#2375, #2465)
|
6 years ago |
|
omar
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
6 years ago |
David Amador
|
994a92d79d
|
Added support to use controllers via SDL_GameController. (#2509)
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
|
6 years ago |
|
omar
|
f159eb35fb
|
Examples: SDL: Removed unused code. (#2484)
|
6 years ago |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
Andre Weissflog
|
74a3878be4
|
emscripten: replace shell_minimal.html with 'soft fullscreen' version
|
6 years ago |
|
omar
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
6 years ago |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
6 years ago |
|
omar
|
1fe6533192
|
Examples: Emscripten: Tweaks for size. (#2494)
|
6 years ago |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
35cbf9c052
|
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
|
6 years ago |
|
omar
|
eeea7da3d0
|
Examples: Emscripten: Fixed error in shell template. (#2494)
|
6 years ago |
|
omar
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
6 years ago |
|
omar
|
882d480b5e
|
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
|
6 years ago |
Nicolas "Pixel" Noble
|
a936d0669c
|
Adding standalone Emscripten example.
|
6 years ago |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
b8fe0df7df
|
Examples: Null: Added Makefile.
|
6 years ago |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
42423d5ea4
|
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)
|
6 years ago |
|
omar
|
1295205cd4
|
Examples: Vulkan: Fixed warnings. (#2480)
|
6 years ago |
|
omar
|
7056032483
|
Merge branch 'vulkan_fix_docking' into docking
|
6 years ago |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
c43dab2414
|
Vulkan: Fix not incrementing semaphore index. (#2472, #2071)
|
6 years ago |
|
omar
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
6 years ago |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
6 years ago |
|
omar
|
d61caf5714
|
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. (#2461, #2348, #2378, #2097)
|
6 years ago |
|
omar
|
e70f866ed2
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
|
6 years ago |
|
omar
|
6bc47dfe48
|
Vulkan: Removed superfluous vkInstance parameters being passed along.
|
6 years ago |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
6 years ago |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
6 years ago |
MindSpunk
|
a45840746e
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
6 years ago |
|
MindSpunk
|
9acb158990
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
6 years ago |
|
omar
|
1ba79baab5
|
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. (#2472, #2461, #2071)
|
6 years ago |
|
omar
|
01de69de36
|
Vulkan: Note for unsupported feature with multi-viewports. (#2071)
|
6 years ago |
|
omar
|
8ec24036d7
|
Vulkan: Viewports: Removed redundant field.
|
6 years ago |
|
omar
|
29269d2aa8
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
6 years ago |