affa7e2422
Examples: imgui_impl_opengl3: Fix empty printout on shader load. ( #2584 )
...
Fixed minor bug in CheckShader and CheckProgram
The log_length reported by
glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length)
will at least return 1, since the string delimiter is also counted.
The old version would always print and empty string to stderr. This is annoying in the emscripten port, since it prints a red error message to the Javascript console. The new version fixes this behavior.
2019-05-27 10:47:18 +02:00
04022114d9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-05-21 14:47:29 +02:00
31e3e861ef
Update changelog, comments, made empty/no-text clipboard return NULL as with other implementation. Minor style tweaks. ( #2546 )
...
Fixed IMGUI_DISABLE_WIN32_FUNCTIONS not disabling IME code.
2019-05-18 17:44:09 +02:00
02de498a41
Add native mac copy/paste support to match win32 ( #2546 )
2019-05-18 17:34:58 +02:00
4158cba1ff
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
2019-05-13 19:23:18 +02:00
02d6d2d487
Platform Binding for GLFW updated with the release of GLFW 3.3 ( #2547 )
...
* With the release of GLFW 3.3, it is now possible to detect correctly monitors working area (see GLFW_HAS_MONITOR_WORK_AREA). GLFW 3.3 also introduced the window hint GLFW_FOCUS_ON_SHOW. This fixed the case where a new created window (viewport) takes the focus even if not visible.
* Disable a GLFW 3.2 windows hack when GLFW 3.3 is detected (related to window focused when shown).
2019-05-11 10:54:56 +02:00
ef13d95466
IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c).
...
Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538 , #2541 )
2019-05-11 10:33:56 +02:00
835a8b2c9b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-05-10 22:56:43 +02:00
42fc563fed
Version 1.71 WIP + fixed minor typo
2019-05-07 16:36:08 +02:00
d1d5075b66
Version 1.70
2019-05-06 14:17:39 +02:00
e6c982509d
Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. ( #2520 , #2502 )
2019-05-06 12:12:32 +02:00
9ddb8493d5
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. ( #2520 , #2502 )
2019-05-06 12:07:29 +02:00
76e61958fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2019-05-06 10:16:43 +02:00
d88121ff5b
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
2019-05-06 10:15:22 +02:00
6c196cf432
Examples Readme and Changelog tweaks, added #2527 , re-ordered examples/README alphabetically.
2019-05-06 10:02:59 +02:00
5ecc9d5865
Examples: Metal: Add GLFW+Metal example
2019-05-06 09:51:21 +02:00
4f22a45cb5
Removed git merge leftovers
2019-05-04 15:02:28 +02:00
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
2019-05-02 14:56:47 +02:00
ae405b83a4
Examples: Added missing per-renderer local changelogs. ( #2037 , #1639 , #2452 )
2019-04-30 22:28:29 +02:00
7c6ba3a1da
ImDrawCallback_ResetRenderState: Added Metal.
2019-04-30 22:18:25 +02:00
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. ( #2037 , #1639 , #2452 )
2019-04-30 22:15:59 +02:00
a649d904d7
Examples: Emscripten: Fixed not enabling Docking and Nav by default. ( #2494 )
2019-04-26 00:28:28 +02:00
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
2019-04-25 17:53:11 +02:00
1ca6e5b59f
Examples: Glut: Added note about missing cursor support. ( #2375 , #2465 )
2019-04-25 12:01:01 +02:00
6789ea3482
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. ( #2509 , #2484 ).
2019-04-23 12:38:59 +02:00
994a92d79d
Added support to use controllers via SDL_GameController. ( #2509 )
...
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
2019-04-23 12:14:05 +02:00
f159eb35fb
Examples: SDL: Removed unused code. ( #2484 )
2019-04-22 10:43:14 +02:00
03b64defa5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-04-19 19:52:45 +02:00
74a3878be4
emscripten: replace shell_minimal.html with 'soft fullscreen' version
2019-04-17 11:59:26 +02:00
1f25cdd6b4
Clarified asserts comments + todo entries. ( #2500 )
2019-04-17 09:59:03 +02:00
655ebe4eaf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2019-04-16 13:14:10 +02:00
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
1fe6533192
Examples: Emscripten: Tweaks for size. ( #2494 )
2019-04-15 17:18:31 +02:00
b89202824e
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2019-04-15 16:03:17 +02:00
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
eeea7da3d0
Examples: Emscripten: Fixed error in shell template. ( #2494 )
2019-04-15 01:46:34 +02:00
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
882d480b5e
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
2019-04-15 01:01:39 +02:00
a936d0669c
Adding standalone Emscripten example.
2019-04-13 22:39:42 +02:00
328e4fa7e7
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2019-04-11 15:53:38 +02:00
b8fe0df7df
Examples: Null: Added Makefile.
2019-04-08 19:16:45 +02:00
cf029b3e1c
Merge branch 'master' into docking
2019-04-08 18:05:52 +02:00
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
1295205cd4
Examples: Vulkan: Fixed warnings. ( #2480 )
2019-04-07 22:27:45 +02:00
7056032483
Merge branch 'vulkan_fix_docking' into docking
2019-04-07 16:23:34 +02:00
50ceb25003
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
2019-04-07 16:23:31 +02:00
c43dab2414
Vulkan: Fix not incrementing semaphore index. ( #2472 , #2071 )
2019-04-07 15:57:07 +02:00
9c364b16ff
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
2019-04-05 20:30:42 +02:00
e099a7dc74
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
2019-04-05 20:27:46 +02:00
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
