omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-03 11:41:53 +01:00 |
|
omar
|
801645d350
|
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
|
2018-12-03 10:17:17 +01:00 |
|
omar
|
48f6fdb349
|
Fixed typo.
|
2018-11-30 18:30:21 +01:00 |
|
omar
|
7658035e5a
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
2018-11-30 18:30:21 +01:00 |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
2018-11-30 18:27:14 +01:00 |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
2018-11-30 18:24:43 +01:00 |
|
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
2018-11-30 18:18:15 +01:00 |
|
omar
|
3c114b280a
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
|
2018-11-29 21:30:26 +01:00 |
|
omar
|
01f940dc9a
|
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
|
2018-11-28 22:50:48 +01:00 |
|
omar
|
19c4fa8dd5
|
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
|
2018-11-28 15:43:00 +01:00 |
|
omar
|
b8d9c5c130
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2018-11-26 21:36:48 +01:00 |
|
omar
|
12a1e7d04e
|
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
|
2018-11-26 19:20:37 +01:00 |
|
omar
|
ddc3f8f069
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2018-11-26 15:32:04 +01:00 |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-11-26 14:53:51 +01:00 |
|
omar
|
35d648341b
|
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. (#2187)
|
2018-11-23 18:12:37 +01:00 |
|
omar
|
d8ab2c1ac9
|
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo
|
2018-11-23 16:55:33 +01:00 |
|
omar
|
862781b195
|
Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)
|
2018-11-23 16:35:17 +01:00 |
|
omar
|
2515413080
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
|
2018-11-22 15:29:18 +01:00 |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-11-22 15:28:27 +01:00 |
|
omar
|
c00a3bd98f
|
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. (#2181)
|
2018-11-21 18:43:25 +01:00 |
|
omar
|
be66f94639
|
Examples: OpenGL3: More explicit testing for == GL_UPPER_LEFT in case glGetIntegerv(GL_CLIP_ORIGIN is not honored properly. (#2186, #2195) Fix f52f0a5277
|
2018-11-21 18:24:24 +01:00 |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
2018-11-15 14:00:01 +01:00 |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-11-15 13:58:46 +01:00 |
|
omar
|
f52f0a5277
|
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186)
|
2018-11-13 18:54:02 +01:00 |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
2018-11-08 16:56:51 +01:00 |
|
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
2018-11-08 16:24:41 +01:00 |
|
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
2018-11-08 16:06:22 +01:00 |
|
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
2018-11-08 15:14:09 +01:00 |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
2018-11-06 09:52:38 +01:00 |
|
omar
|
131bf5ee4a
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
2018-11-06 09:51:21 +01:00 |
|
omar
|
797f2044cd
|
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)
|
2018-11-06 09:51:09 +01:00 |
|
omar
|
5ea08394f5
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
2018-11-06 09:46:43 +01:00 |
|
omar
|
9ee86f22b7
|
Examples: Win32: Handle UTf-8 in platform window title setting. (#2164)
|
2018-11-05 17:37:06 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
f388216ff0
|
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. (#2010, #2043, #2091)
|
2018-11-05 17:28:09 +01:00 |
|
Michał Janiszewski
|
2e6e1bec58
|
Examples: Add missing include guards (#2166)
|
2018-11-01 20:56:36 +01:00 |
|
Cort
|
ed0f7004d0
|
Examples: Vulkan: Avoid unreferenced parameter warning. (#2162)
|
2018-10-30 21:15:30 +01:00 |
|
Hui
|
e6db078eda
|
gladLoadGL() return 0 to indicate failure (#2157)
|
2018-10-29 15:51:32 +01:00 |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
2018-10-25 23:45:19 +02:00 |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-25 23:41:13 +02:00 |
|
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
2018-10-25 17:45:48 +02:00 |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:57:54 +02:00 |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:56:26 +02:00 |
|
Brandon
|
5f79a28a07
|
Examples: SDL: Fixed usage of SDL_GetDisplayDPI (#2137, #1676)
|
2018-10-18 10:48:18 +02:00 |
|
omar
|
745f01022e
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133, #1929)
|
2018-10-17 10:48:53 +02:00 |
|
Warren Moore
|
b4488d4f48
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133)
|
2018-10-17 10:46:49 +02:00 |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-10-12 15:50:48 +02:00 |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
2018-10-12 13:01:20 +02:00 |
|
hesiod
|
500a60debc
|
Examples: OpenGL3: Cast compile/link status to GLboolean (#2112, #2125)
Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.
|
2018-10-07 18:14:24 +02:00 |
|
omar
|
02afbaeef0
|
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. (#2112) [@hesiod]
|
2018-10-06 11:35:05 +02:00 |
|
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
2018-10-05 11:36:49 +02:00 |
|
Michael Vetter
|
084c26aa41
|
Fix spacing in imgui_imp_sdl example (#2111)
|
2018-10-05 10:04:10 +02:00 |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
2018-10-01 18:35:21 +02:00 |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
2018-09-26 21:35:09 +02:00 |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
788febf044
|
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097)
|
2018-09-24 10:13:01 +02:00 |
|
omar
|
fda57f48d5
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
2018-09-21 11:52:32 +02:00 |
|
omar
|
7abc368927
|
Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542)
|
2018-09-20 18:46:36 +02:00 |
|
omar
|
7c3b9172ad
|
Examples: Referring to missing gamepad support in back-end that are missing it.
|
2018-09-20 10:37:55 +02:00 |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
2018-09-20 10:31:23 +02:00 |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-14 11:38:10 +02:00 |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
2018-09-13 16:50:13 +02:00 |
|
omar
|
9cc63ba279
|
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078)
|
2018-09-11 22:00:57 +02:00 |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|
omar
|
b872aa5c8e
|
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
|
2018-09-10 11:24:27 +02:00 |
|
MindSpunk
|
7eadcf7d7d
|
example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)
|
2018-09-09 21:09:58 +02:00 |
|
omar
|
a82be53407
|
Merge branch 'docking2' into viewport_docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-06 22:28:21 +02:00 |
|
omar
|
49533bc86e
|
Examples: Enabled Docking + Nav by default in the branch. (#351)
|
2018-09-06 21:53:35 +02:00 |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
2018-09-05 11:08:57 +02:00 |
|
Jiří Šebele
|
f8b7e4d94f
|
Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002)
`gladLoadGL` returns 0 on fail, not the other way around.
|
2018-09-03 19:36:02 +02:00 |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-08-31 18:39:02 +02:00 |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
2018-08-31 11:37:14 +02:00 |
|
Omar Cornut
|
be6ea86f8d
|
OSX: Added imgui_widgets.cpp to xcode project files.
|
2018-08-31 11:29:25 +02:00 |
|
omar
|
e312363007
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
2018-08-30 19:00:33 +02:00 |
|
omar
|
01586d33f3
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
2018-08-30 14:29:11 +02:00 |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2018-08-29 17:40:52 +02:00 |
|
omar
|
1b61b6b208
|
Examples: Vulkan: Minor tweaks.
|
2018-08-28 18:22:36 +02:00 |
|
omar
|
b127027cbd
|
Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
|
2018-08-28 16:08:04 +02:00 |
|
Jérémie Dumas
|
e476b7e727
|
WIP on configurable OpenGL loader. (#2001, #2002)
|
2018-08-28 16:07:58 +02:00 |
|
omar
|
705ff49400
|
Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 (#1542)
|
2018-08-25 21:21:14 +02:00 |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
omar
|
4dea0327e7
|
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
|
2018-08-25 21:16:08 +02:00 |
|
omar
|
0ada716184
|
Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. (#1542)
|
2018-08-25 20:15:18 +02:00 |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2018-08-22 21:35:44 +02:00 |
|
omar
|
7268c65d73
|
Examples: imgui_impl_vulkan: Comments (re)
|
2018-08-22 17:59:58 +02:00 |
|
omar
|
3fdfac3377
|
Examples: imgui_impl_vulkan: Comments
|
2018-08-22 16:43:29 +02:00 |
|
omar
|
5d630c930d
|
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542)
|
2018-08-15 16:15:44 -07:00 |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-08-13 17:50:48 -07:00 |
|
omar
|
421dc19798
|
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015)
|
2018-08-09 17:49:48 +02:00 |
|
Ryan Crandall
|
9c0805010f
|
imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID (#2015, #301)
|
2018-08-09 17:44:29 +02:00 |
|
omar
|
d5793102db
|
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873)
|
2018-08-09 17:42:53 +02:00 |
|
Ryan Crandall
|
34203d5008
|
imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined (#2014)
|
2018-08-09 17:32:31 +02:00 |
|
luk1337
|
e3eb4111cc
|
Examples: Fix 'How to build' instructions for SDL2 examples (#2012)
|
2018-08-08 18:55:09 +02:00 |
|
omar
|
35124cdd07
|
imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. (#2002, #1873)
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
|
2018-08-08 17:41:30 +02:00 |
|
omar
|
00e29832d4
|
Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. (#1996)
|
2018-08-03 15:04:35 +02:00 |
|
omar
|
8ef0ca9765
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-08-01 12:27:56 +02:00 |
|
omar
|
d69b2a1c1d
|
Changelog for #1989
|
2018-08-01 12:23:59 +02:00 |
|
Matthias Moulin
|
6011ddf1e5
|
imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 (#1989)
|
2018-08-01 12:22:04 +02:00 |
|
omar
|
b1fc988c6b
|
imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. (#1941)
|
2018-08-01 11:34:17 +02:00 |
|