ocornut
|
25a9209b75
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2020-08-17 23:29:17 +02:00 |
|
omar
|
009276b6cb
|
Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads (#3394, #2424, #1463) [@nobody-special666]
Amend 7dea158175
+ Fix vsproj GUID
|
2020-08-10 15:31:48 +02:00 |
|
omar
|
2c13a74a9d
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
|
2020-08-10 11:35:51 +02:00 |
|
omar
|
209a6a751c
|
Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
This reverts commit a24578ec09.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
|
2020-08-10 11:33:59 +02:00 |
|
ocornut
|
ede8825fb2
|
Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 (#3390)
|
2020-08-07 15:24:00 +02:00 |
|
omar
|
a24578ec09
|
Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)
|
2020-08-05 15:02:30 +02:00 |
|
omar
|
963839373c
|
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
|
2020-08-03 21:31:42 +02:00 |
|
Rokas Kupstys
|
3d4af15d1d
|
Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available.
|
2020-07-17 18:44:09 +02:00 |
|
omar
|
cba52b66af
|
Backends: GLFW: Fixed enabling ImGuiBackendFlags_HasMouseHoveredViewport broken by 950539b7.
As it turns out, back-end passing NULL hovered with HasMouseHoveredViewport is also broken which defeats some of its purpose.
|
2020-07-17 18:14:04 +02:00 |
|
omar
|
f79f0e42f7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
|
2020-07-14 18:38:47 +02:00 |
|
omar
|
fb7f6cab8c
|
Backends: Amend, docs + extra comments. (#3330, #3245)
|
2020-07-10 14:36:00 +02:00 |
|
Moritz Heinemann
|
06f7854b16
|
Backends: OpenGL3: Add glad 2 to OpenGL loaders. (#3330)
|
2020-07-10 14:34:25 +02:00 |
|
omar
|
b626dd57d3
|
Backends: DX12, Viewports: Tidying up, renaming.
|
2020-07-10 12:20:03 +02:00 |
|
omar
|
cb1d578470
|
Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. (#3347)
|
2020-07-10 12:09:24 +02:00 |
|
omar
|
ab4ef822f0
|
Version 1.78 WIP
|
2020-06-30 16:56:09 +02:00 |
|
omar
|
90ea7e2f2f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-06-30 16:43:16 +02:00 |
|
Rokas Kupstys
|
0738611559
|
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
|
2020-06-30 16:37:21 +02:00 |
|
omar
|
ddabfc3477
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2020-06-29 17:15:40 +02:00 |
|
omar
|
9418dcb693
|
Version 1.77
+ fix minor clang-tidy warnings which seems reasonable
|
2020-06-29 15:54:28 +02:00 |
|
omar
|
20d61f5f62
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-20 22:06:01 +02:00 |
|
omar
|
99f68d7958
|
Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
|
2020-06-19 11:34:04 +02:00 |
|
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
ocornut
|
8baa4ccff5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-06 20:31:24 +02:00 |
|
Rokas Kupstys
|
5af8a8c7e8
|
CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings.
|
2020-06-05 15:50:12 +02:00 |
|
Rokas Kupstys
|
dc49b14e29
|
Misc: Fix examples of using other OpenGL3 bindings in Makefiles.
|
2020-06-05 14:05:39 +02:00 |
|
Mark Jansen
|
6eb66fbef3
|
Backends: Win32: Cache the result of a windows version check. (#3283)
This is not expected to change while the application is running :)
|
2020-06-05 01:23:18 +02:00 |
|
Giovanni Funchal
|
3f26a07ee1
|
Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. (#3246)
|
2020-05-25 18:57:23 +02:00 |
|
ocornut
|
5d472c4895
|
Merge branch 'master' into docking + fixes for #3259
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2020-05-25 18:32:15 +02:00 |
|
ocornut
|
a06eb83359
|
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
|
2020-05-25 18:15:59 +02:00 |
|
ocornut
|
bb2529dd48
|
Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.
|
2020-05-25 12:26:59 +02:00 |
|
ocornut
|
a056603d8b
|
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
|
2020-05-25 12:12:02 +02:00 |
|
ocornut
|
9c209d5a90
|
Minor amend 9028088 (#3261)
|
2020-05-25 11:42:45 +02:00 |
|
Nicolas Burrus
|
43f79aa210
|
Backends: OSX: import the glfw workaround to avoid missing mouse clicks. (#3261)
|
2020-05-25 11:42:45 +02:00 |
|
Nicolas Burrus
|
39d17ca07f
|
Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. (#3260)
|
2020-05-25 11:29:41 +02:00 |
|
Espyo
|
f44962c01a
|
Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. (#3252)
|
2020-05-20 17:48:21 +02:00 |
|
omar
|
75bbbda645
|
Examples: Update comments to get SDL2 package with msys2's pacman (#3251)
|
2020-05-20 11:44:00 +02:00 |
|
omar
|
e4d8267188
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-05-16 14:14:51 +02:00 |
|
Chris Savoie
|
03ea87ea28
|
Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings.
|
2020-05-11 19:31:35 +02:00 |
|
Albert Vaca
|
685ca27d84
|
Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. (#3199)
|
2020-05-08 17:32:34 +02:00 |
|
Ivan Zinkevich
|
1e7672acf4
|
Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. (#3210)
Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean.
|
2020-05-08 17:26:46 +02:00 |
|
omar
|
582f4db59b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-05-07 22:13:47 +02:00 |
|
omar
|
11a3e75f47
|
Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). (#3183)
|
2020-05-04 20:46:20 +02:00 |
|
omar
|
5116eee108
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-05-04 15:05:07 +02:00 |
|
omar
|
099091280f
|
Backends: DX10/DX11: Minor tweaks.
|
2020-05-04 11:40:31 +02:00 |
|
Silent
|
1e9abf60d1
|
Backends: Keep shader blobs as local variables. (#3176)
|
2020-05-04 11:22:43 +02:00 |
|
omar
|
d5ce3b43ae
|
Backends: Vulkan: Fixed error in if initial frame has no vertices. (#3177)
|
2020-05-04 11:03:41 +02:00 |
|
Chris Savoie
|
73c30aa085
|
Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed.
|
2020-04-26 20:26:06 +02:00 |
|
Matt Haynie
|
d3212482fe
|
Fix multiple macro definitions of GLFW_INCLUDE_NONE (#3157)
|
2020-04-23 22:58:45 +02:00 |
|
u3shit
|
528b12eb7a
|
Fix glClipControl(GL_UPPER_LEFT) handling in opengl3.
|
2020-04-22 10:10:51 +02:00 |
|