Andre Weissflog
|
74a3878be4
|
emscripten: replace shell_minimal.html with 'soft fullscreen' version
|
2019-04-17 11:59:26 +02:00 |
|
omar
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
2019-04-17 09:59:03 +02:00 |
|
omar
|
7baf45cffa
|
Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
|
2019-04-16 22:02:56 +02:00 |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-04-16 13:14:10 +02:00 |
|
omar
|
742b5f4c68
|
Merged a bunch of small changes from Docking branch to reduce the difference between branches.
Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.
|
2019-04-16 13:07:43 +02:00 |
|
omar
|
311469e9d6
|
Internals: Columns: Some renaming, extracted code into GetColumnsID().
|
2019-04-16 11:58:54 +02:00 |
|
omar
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
2019-04-15 18:47:36 +02:00 |
|
omar
|
1fe6533192
|
Examples: Emscripten: Tweaks for size. (#2494)
|
2019-04-15 17:18:31 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
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.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
eeea7da3d0
|
Examples: Emscripten: Fixed error in shell template. (#2494)
|
2019-04-15 01:46:34 +02:00 |
|
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)
|
2019-04-15 01:28:44 +02:00 |
|
omar
|
882d480b5e
|
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
|
2019-04-15 01:01:39 +02:00 |
|
omar
|
622556719e
|
Merge branch 'standalone-emscripten' of https://github.com/nicolasnoble/imgui
|
2019-04-15 00:36:56 +02:00 |
|
Nicolas "Pixel" Noble
|
a936d0669c
|
Adding standalone Emscripten example.
|
2019-04-13 22:39:42 +02:00 |
|
omar
|
f70eacee8e
|
Docking: Internal: Added helper for automation to process docking at the mouse level.
|
2019-04-13 19:50:30 +02:00 |
|
omar
|
433a7556c7
|
Docking: Fixed another issue where the resulting node of a split would sometimes recall the pos/size of previous host window. Spent a whole day adding framework for testing more of docking so hopefully we'll heading toward the magical world of less regressions. (#2109)
|
2019-04-13 19:19:56 +02:00 |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-13 18:53:00 +02:00 |
|
omar
|
e805ca29d8
|
Internals: Moved resize grips and borders to nav layer 1 so that testing system doesn't attempt to scroll to get them inside the InnerRect.
|
2019-04-13 18:51:32 +02:00 |
|
omar
|
800fb26606
|
Docking: Renamed target_node > node in some functions to facilitate debugger watch use across functions.
|
2019-04-13 00:36:24 +02:00 |
|
omar
|
224f087a5f
|
Docking: Rename typo Autority -> Authority + Rename DockContextNewFrameUpdateDocking -> DockContextUpdateDocking.
|
2019-04-13 00:36:24 +02:00 |
|
omar
|
fb2626c21b
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:29:27 +02:00 |
|
omar
|
092426bed2
|
Docking: Hold Shift to force disable docking. (#2109)
|
2019-04-13 00:27:44 +02:00 |
|
omar
|
c6f1b7b92a
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:27:44 +02:00 |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
2019-04-12 22:16:59 +02:00 |
|
omar
|
ee02cdbf03
|
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
|
2019-04-12 17:49:40 +02:00 |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-04-11 15:53:38 +02:00 |
|
omar
|
07a70dc972
|
Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.
|
2019-04-11 15:40:36 +02:00 |
|
omar
|
570d0bbbda
|
Demo: Comments, tweaks, removed some uses of ImColor helpers.
|
2019-04-11 15:23:54 +02:00 |
|
omar
|
f3110a57cd
|
Docking: Fixed an issue where newly created dock node override hosted window pos/size (#2109, #2386)
|
2019-04-11 14:51:01 +02:00 |
|
omar
|
b8fe0df7df
|
Examples: Null: Added Makefile.
|
2019-04-08 19:16:45 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
1391904fd2
|
Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684, #2341)
|
2019-04-08 17:59:25 +02:00 |
|
omar
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
2019-04-08 16:13:51 +02:00 |
|
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)
|
2019-04-07 23:02:07 +02:00 |
|
omar
|
1295205cd4
|
Examples: Vulkan: Fixed warnings. (#2480)
|
2019-04-07 22:27:45 +02:00 |
|
omar
|
7056032483
|
Merge branch 'vulkan_fix_docking' into docking
|
2019-04-07 16:23:34 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
ccca76fdea
|
Merge branch 'vulkan_fix_master'
|
2019-04-07 16:22:47 +02:00 |
|
omar
|
302af7b2c9
|
FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).
|
2019-04-07 16:22:41 +02:00 |
|
omar
|
c43dab2414
|
Vulkan: Fix not incrementing semaphore index. (#2472, #2071)
|
2019-04-07 15:57:07 +02:00 |
|
omar
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
2019-04-05 20:30:42 +02:00 |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
2019-04-05 20:27:46 +02:00 |
|
omar
|
c8fd4afd75
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
2019-04-05 20:20:24 +02:00 |
|
omar
|
bd351e9ac5
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
2019-04-05 20:20:08 +02:00 |
|
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)
|
2019-04-05 18:52:45 +02:00 |
|
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
|
2019-04-05 18:27:15 +02:00 |
|
omar
|
6bc47dfe48
|
Vulkan: Removed superfluous vkInstance parameters being passed along.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|