10 Commits (6024051a2fcfc75d640ba5ed1660bc607ad49937)

Author SHA1 Message Date
omar 0cbb96895a Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
5 years ago
Funto 75d540d336 Example: Emscripten: Fix for compilation (filesystem module is required) (#2734) 5 years ago
omar 431aa4e456 Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while. 5 years ago
omar a649d904d7 Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494) 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
Andre Weissflog 74a3878be4 emscripten: replace shell_minimal.html with 'soft fullscreen' version 6 years ago
omar 1fe6533192 Examples: Emscripten: Tweaks for size. (#2494) 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
Nicolas "Pixel" Noble a936d0669c Adding standalone Emscripten example. 6 years ago