ocornut
|
6df1a06fc3
|
Merge branch 'master' into docking
|
2024-07-29 23:18:54 +02:00 |
|
ocornut
|
3f9a90e2a3
|
Docs: added extraneous link to Getting Started section.
|
2024-07-25 16:59:40 +02:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
f8f805f046
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2023-07-20 23:18:47 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
4f692ba840
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
|
2023-04-19 16:35:50 +02:00 |
|
Mark Jansen
|
a566ecc58f
|
Examples: Add Win32/Winapi + OpenGL example. (#3218, #5170 and #6086, #2772, #2600, #2359, #2022, #1553)
Removed mulit-viewpot stuff in this commit on master, will be re-added separately.
|
2023-04-19 16:22:53 +02:00 |
|
ocornut
|
ee5ce36745
|
Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2023-04-04 21:17:47 +02:00 |
|
ocornut
|
f070497cbd
|
Backends: Win32/SDL2/SDL3/GLFW: Added support for io.AddMouseSourceEvent(). (#2334, #2702)
SDL doesn't distinguish Pen yet, but we don't need it as much as TouchScreen which will alter trickling.
|
2023-04-04 20:19:01 +02:00 |
|
ocornut
|
3ea0fad204
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
2022-12-01 20:22:27 +01:00 |
|
ocornut
|
1a497c2499
|
Inputs, IO: reworked ImGuiMod_Shortcut to redirect to Ctrl/Super at runtime instead of compile-time. (#5923, #456)
|
2022-11-29 19:07:50 +01:00 |
|
ocornut
|
377b864bb4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2022-03-23 17:21:34 +01:00 |
|
ocornut
|
1e18da5c38
|
Backends, Examples: Add comments about using WndProc handler and WantCaptureXXX flags. (#5061)
+ update README.
|
2022-02-28 20:51:50 +01:00 |
|
ocornut
|
ef681e7019
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_sdl.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2022-01-10 15:24:21 +01:00 |
|
thedmd
|
746c9f76e4
|
Backends: Win32: Update to use io.AddEventKey() will full key map (#2625, #4858)
|
2022-01-10 15:11:54 +01:00 |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2021-06-04 17:28:45 +02:00 |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
2021-05-27 13:59:35 +02:00 |
|
ocornut
|
6aee4bcdc5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
2021-03-02 18:27:07 +01:00 |
|
ocornut
|
c154629152
|
Backends: Win32: Added ImGui_ImplWin32_EnableAlphaCompositing() helper. (#2766, #3447)
Pragma linking with dwmapi.lib (Vista-era, ~9 kb). MinGW users will need to link with -ldwmapi.
|
2021-02-18 16:04:11 +01:00 |
|
ocornut
|
577e7cb493
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
2021-01-28 21:02:13 +01:00 |
|
Kuanlan
|
633d1033af
|
Backends: Win32: dynamically load XInput library (#3646, #3645, #3248, #2716)
|
2021-01-25 16:30:44 +01:00 |
|
ocornut
|
042a3b01d2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/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
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2020-10-14 14:44:03 +02:00 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
2020-10-14 14:42:00 +02:00 |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
2020-10-14 14:41:40 +02:00 |
|