omar d3d998a885 Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/README.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp

2019-06-12 18:40:50 +02:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

build_win64.bat

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

CMakeLists.txt

Readme, comments, dear imgui prefixes

2019-06-11 16:11:36 +02:00

example_glfw_vulkan.vcxproj

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

example_glfw_vulkan.vcxproj.filters

example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)

2018-09-09 21:09:58 +02:00

gen_spv.sh

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

glsl_shader.frag

Examples: Vulkan: Added shader sources/references in the .cpp source.

2019-04-03 11:23:54 +02:00

glsl_shader.vert

Examples: Vulkan: Added shader sources/references in the .cpp source.

2019-04-03 11:23:54 +02:00

main.cpp

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.

2019-06-06 16:13:30 +02:00