ocornut
|
942b64abfc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-10-24 18:15:51 +02:00 |
|
ocornut
|
41f02825fc
|
Version 1.91.5 WIP
|
2024-10-23 12:16:28 +02:00 |
|
ocornut
|
c71e4e8c7c
|
Merge branch 'master' into docking
|
2024-10-18 22:04:08 +02:00 |
|
ocornut
|
83b64b8be2
|
Version 1.91.4
|
2024-10-18 21:45:36 +02:00 |
|
ocornut
|
4e2126ee44
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_widgets.cpp
|
2024-10-18 18:59:27 +02:00 |
|
ocornut
|
1ff9768aa3
|
Nav: (Breaking) renamed ImGuiCol_NavHighlight to ImGuiCol_NavCursor. (#1074, #2048, #7237, #8059, #1712, #7370, #787)
|
2024-10-18 18:49:44 +02:00 |
|
ocornut
|
514a97a9b7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx11.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx12.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdlrenderer2.cpp
# backends/imgui_impl_sdlrenderer2.h
# backends/imgui_impl_sdlrenderer3.cpp
# backends/imgui_impl_sdlrenderer3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
2024-10-14 19:23:23 +02:00 |
|
ocornut
|
98d52b7b26
|
DrawList: AddCallback() added an optional size parameter allowing to copy and store any amount of user data for usage by callbacks: (#6969, #4770, #7665)
|
2024-10-11 13:29:13 +02:00 |
|
ocornut
|
6b8accbfa1
|
Fixed building when defining ImTextureID to a multi-token name. (#1641)
Amend 92b9498
|
2024-10-08 14:29:21 +02:00 |
|
ocornut
|
92b94980c6
|
(Breaking) Default ImTextureID to use a Im64 instead of void* (#1641)
|
2024-10-08 14:21:44 +02:00 |
|
ocornut
|
fa9277d12d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx11.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx12.h
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# imgui.h
|
2024-10-07 22:05:57 +02:00 |
|
ocornut
|
1dde20ff4a
|
Version 1.91.4 WIP
|
2024-10-07 17:39:28 +02:00 |
|
ocornut
|
b4c96355c9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-10-04 15:43:05 +02:00 |
|
ocornut
|
cb16568fca
|
Version 1.91.3
|
2024-10-04 15:42:45 +02:00 |
|
ocornut
|
10fe2b674a
|
Merge branch 'master' into docking
|
2024-09-20 18:43:48 +02:00 |
|
ocornut
|
faca859043
|
Version 1.91.3 WIP
|
2024-09-19 15:51:06 +02:00 |
|
ocornut
|
bc77cccd31
|
Merge branch 'master' into docking
|
2024-09-19 14:52:43 +02:00 |
|
ocornut
|
a9f72ab681
|
Version 1.91.2
|
2024-09-19 14:47:13 +02:00 |
|
ocornut
|
ae8688974b
|
Merge branch 'master' into docking
|
2024-09-17 21:08:03 +02:00 |
|
ocornut
|
6ce26ef11d
|
AddFont: added assert to better detect uninitialized struct. (#7993)
|
2024-09-17 12:25:21 +02:00 |
|
ocornut
|
7694e89e89
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-09-09 16:54:40 +02:00 |
|
ocornut
|
193c1e2366
|
Version 1.91.2 WIP
|
2024-09-05 20:03:23 +02:00 |
|
ocornut
|
f63c95a076
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-09-04 16:58:44 +02:00 |
|
ocornut
|
1dfbb100d6
|
Version 1.91.1
|
2024-09-04 16:53:43 +02:00 |
|
ocornut
|
fed4841bd4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-08-22 20:26:59 +02:00 |
|
ocornut
|
eb7201b902
|
Fonts: Made it possible to use PushFont()/PopFont() calls accross Begin() calls. (#3224, #3875, #6398, #7903)
|
2024-08-20 15:37:12 +02:00 |
|
ocornut
|
24b077c7f8
|
Merge branch 'master' into docking (multi-viewport broken until next commit)
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-08-19 14:44:35 +02:00 |
|
ocornut
|
8cc6eee295
|
Fonts: amend assert when glyph range data seems incorrect. (#7856)
|
2024-08-03 15:25:47 +02:00 |
|
ocornut
|
d8c98c8c14
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
|
2024-08-01 19:07:53 +02:00 |
|
ocornut
|
dcf54782d4
|
Version 1.91.WIP
|
2024-07-31 16:34:28 +02:00 |
|
ocornut
|
139e99ca37
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2024-07-30 16:57:42 +02:00 |
|
ocornut
|
8199457a7d
|
Version 1.91.0
|
2024-07-30 16:56:31 +02:00 |
|
ocornut
|
3f61da7e8b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-07-02 17:48:38 +02:00 |
|
ocornut
|
5496050f5f
|
Added TextLink(), TextLinkOpenURL() hyperlink widgets. (#7660)
|
2024-07-02 17:21:44 +02:00 |
|
ocornut
|
84cc72f372
|
Version 1.91.0 WIP
|
2024-07-01 19:02:42 +02:00 |
|
ocornut
|
3369cbd277
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
|
2024-07-01 17:10:12 +02:00 |
|
ocornut
|
cb16be3a3f
|
Version 1.90.9
|
2024-07-01 17:03:21 +02:00 |
|
ocornut
|
3e7f1d42db
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
2024-06-18 17:45:17 -07:00 |
|
ocornut
|
21bda2ed99
|
TabBar, Style: added ImGuiTabBarFlags_DrawSelectedOverline and ImGuiCol_TabSelectedOverline, ImGuiCol_TabDimmedSelectedOverline.
|
2024-06-18 17:41:43 -07:00 |
|
ocornut
|
1b9593e889
|
Style: (Breaking) renamed ImGuiCol_TabActive -> ImGuiCol_TabSelected, ImGuiCol_TabUnfocused -> ImGuiCol_TabDimmed, ImGuiCol_TabUnfocusedActive -> ImGuiCol_TabDimmedSelected.
Amend #261, #351
|
2024-06-18 17:37:29 -07:00 |
|
ocornut
|
7260bb51cf
|
Version 1.90.9 WIP
|
2024-06-07 16:57:01 +02:00 |
|
ocornut
|
6d948ab47e
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-06-06 17:52:55 +02:00 |
|
ocornut
|
6f7b5d0ee2
|
Version 1.90.8
|
2024-06-06 17:45:40 +02:00 |
|
ocornut
|
222dd775fc
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-05-28 17:11:57 +02:00 |
|
ocornut
|
1f9fc382c3
|
Version 1.90.8 WIP
Tidying up todo.txt
|
2024-05-28 10:09:31 +02:00 |
|
ocornut
|
2db79d0868
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-05-27 15:47:30 +02:00 |
|
ocornut
|
00ad3c65bc
|
Version 1.90.7
|
2024-05-27 15:47:04 +02:00 |
|
ocornut
|
eabe98f6d5
|
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2024-05-14 16:29:06 +02:00 |
|
ocornut
|
f48aae600a
|
Version 1.90.7 WIP
|
2024-05-13 14:47:37 +02:00 |
|
ocornut
|
e391fe2e66
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2024-05-08 16:17:32 +02:00 |
|