ocornut
|
ff2d6815ef
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-12-04 19:56:35 +01:00 |
|
ocornut
|
19a1f2a5d2
|
Fonts: fixed AddCustomRect() not being packed with TexGlyphPadding + not accounted in surface area. (#8107)
|
2024-11-29 18:58:01 +01:00 |
|
ocornut
|
cdf21f6773
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2024-11-21 14:52:04 +01:00 |
|
ocornut
|
20360e00ce
|
Merge miscellaneous small changes to reduce drift with texture update branch.
- ImGuiDebugLogFlags_EventFont is yet unused.
|
2024-11-20 21:46:47 +01:00 |
|
ocornut
|
551b6c4d66
|
Tools: binary_to_compressed_c: added -u8/-u32/-base85 export options.
|
2024-11-20 14:32:44 +01:00 |
|
ocornut
|
d0e870aad2
|
Misc: changed embedded ProggyClean encoding to save a bit of binary space (~12kb to 9.5kb). (#8161)
Encoding as char to ensure compatibility with big endian (#81)
|
2024-11-20 14:16:34 +01:00 |
|
chuikingshek
|
5ae3dd52a0
|
Fonts: added IMGUI_DISABLE_DEFAULT_FONT macro. (#8161)
|
2024-11-20 13:45:42 +01:00 |
|
ocornut
|
3381ab423b
|
Version 1.91.6 WIP + fixed typo in tooltip.
|
2024-11-12 11:56:21 +01:00 |
|
ocornut
|
368123ab06
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui_draw.cpp
|
2024-11-07 19:58:23 +01:00 |
|
ocornut
|
f401021d5a
|
Version 1.91.5
|
2024-11-07 19:57:33 +01:00 |
|
ocornut
|
31b967f098
|
Fix 01d27a4 (sorry I cherry-picked from wrong branch)
|
2024-11-07 19:35:00 +01:00 |
|
ocornut
|
01d27a4acd
|
Internals: added IM_LIKELY(), IM_UNLIKELY() helper macros (yet unused). Added ImFontGetCharAdvanceX() macro.
|
2024-11-07 19:33:25 +01:00 |
|
ocornut
|
17bd417a3d
|
AddCustomRectFontGlyph: added storage for Colored bool in ImFontAtlasCustomRect. (#8133)
|
2024-11-07 14:58:15 +01:00 |
|
ocornut
|
d97bbf1904
|
Tabs, Style: made ImGuiCol_TabDimmedSelectedOverline alpha 0 (not visible) in default styles.
|
2024-11-06 18:08:15 +01:00 |
|
ocornut
|
83660e37e3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glut.cpp
# backends/imgui_impl_glut.h
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_demo.cpp
|
2024-11-06 17:58:35 +01:00 |
|
ocornut
|
be2d006e2e
|
Align warning blocks. Removed -Wunused-function, -Wmissing-prototypes from imgui_internal.h
As supposedly they were for stb_textedit.h which is now moved to imgui_draw.cpp
|
2024-11-05 10:50:49 +01:00 |
|
Maya Warrier
|
88e232739b
|
Ignore clang warning Wnontrivial-memaccess (#8129)
Produced when memset(this, ..) is used on a non-trivially copyable type
|
2024-11-05 10:44:39 +01:00 |
|
ocornut
|
0bde57c25a
|
Font, Misc: remove qualifier from most font functions.
Fixed ClearOutputData() not clearing Used4kPagesMap (mostly harmless).
|
2024-10-29 11:48:37 +01:00 |
|
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 |
|