ocornut
|
8679cfa2d8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
# imgui.cpp
|
2025-02-07 18:27:32 +01:00 |
|
fdsa
|
4f1d3809c3
|
Fixed tabs and spaces (#8377)
|
2025-02-06 19:54:43 +01:00 |
|
ocornut
|
355cb589e3
|
Merge branch 'master' into docking, incl conflict merge in BeginMenuBar() for #8267
# Conflicts:
# imgui_widgets.cpp
|
2025-01-24 19:40:54 +01:00 |
|
ocornut
|
8a1613a382
|
Fonts: OversampleH/OversampleV value defaults to 0 for automatic selection.
|
2025-01-24 19:32:30 +01:00 |
|
ocornut
|
6e94f6cefb
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_internal.h
|
2025-01-20 18:04:31 +01:00 |
|
ocornut
|
4c64ba16c5
|
imgui_freetype: fixed issue where glyph advances would incorrectly be snapped to pixels.
|
2025-01-16 17:42:00 +01:00 |
|
ocornut
|
960a6f14bf
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_metal.mm
# imgui.cpp
|
2025-01-08 14:36:14 +01:00 |
|
ocornut
|
0514332474
|
Avoid clang/gcc warnings: -Wnontrivial-memaccess in backends. (#8295, #8129, #8135)
|
2025-01-08 11:44:00 +01:00 |
|
ocornut
|
9cc0bf89bd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
|
2025-01-06 17:59:22 +01:00 |
|
juur
|
f169102c8e
|
Misc: fixed misc/cpp/imgui_stdlib.h/.cpp not supporting IMGUI_DISABLE. (#8294)
|
2025-01-06 14:16:10 +01:00 |
|
ocornut
|
a9cd0f5e42
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_allegro5.cpp
# backends/imgui_impl_allegro5.h
# backends/imgui_impl_android.cpp
# backends/imgui_impl_android.h
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl2.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2024-12-11 12:27:25 +01:00 |
|
ocornut
|
566558b17c
|
Replacing NULL with nullptr in examples/backends when they creeped back. (#6313, #7071, #4537)
|
2024-12-05 12:25:02 +01:00 |
|
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
|
ee2119d7cb
|
imgui_freetype: Fix build broken by 19a1f2a (#8107)
|
2024-11-29 19:10:39 +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 |
|
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
|
3b683927ee
|
imgui_freetype: Fixed a crash in build font atlas when using merged fonts and the first font in a merged set has no loaded glyph. (#8081)
|
2024-11-07 14:39:54 +01: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 |
|
Pascal Thomet
|
04d9a04557
|
imgui_freetype: Added support for plutosvg to render OpenType SVG fonts. (#7927, #7187 + #6591, #6607)
See #7927 for details.
|
2024-10-17 11:01:59 +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
|
3369cbd277
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
|
2024-07-01 17:10:12 +02:00 |
|
ocornut
|
50a0f18e6a
|
imgui_freetype: fixed divide by zero while handling FT_PIXEL_MODE_BGRA glyphs. (#7267, #3369)
|
2024-07-01 14:58:35 +02:00 |
|
ocornut
|
b39fc84f89
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-05-16 19:57:04 +02:00 |
|
Hubert Maier
|
07dbcf1f70
|
Fixed typos. (#7593)
|
2024-05-16 16:13:01 +02:00 |
|
ocornut
|
ebcfcd8da3
|
Merge branch 'master' into docking
|
2024-01-09 22:39:06 +01:00 |
|
Pascal Thomet
|
4758f74676
|
imgui_freetype: fix nullptr to ImTextureID cast (#7192)
|
2024-01-03 22:54:36 +01:00 |
|
ocornut
|
8add6bcb9f
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2023-12-14 17:21:15 +01:00 |
|
ocornut
|
aaf157cfdd
|
Commented out ImGuiFreeType::BuildFontAtlas() obsoleted in 1.81. Commented out legacy ImGuiColumnsFlags_XXX symbols redirecting to ImGuiOldColumnsFlags_XXX, obsoleted in 1.80.
Amend 9499afdf and 72de6f336
|
2023-12-05 17:04:19 +01:00 |
|
ocornut
|
ce0d0ac829
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2023-11-15 16:08:53 +01:00 |
|
ocornut
|
46843b683b
|
Fonts: minor/shallow amends (#6925)
|
2023-11-13 19:00:29 +01:00 |
|
thedmd
|
ade4d0e08a
|
Fonts: added support for RasterizerDensity to FreeType based atlas generator. (#6925)
|
2023-11-13 19:00:28 +01:00 |
|
ocornut
|
72ebd91567
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
|
2023-10-05 15:10:45 +02:00 |
|
DKing
|
701a047ac0
|
Fonts: Fix clang compiling warning & error with freetype + lunasvg (#6873, #6842, #6591)
Amend d6360c1
|
2023-09-28 19:33:27 +02:00 |
|
ocornut
|
3ce6b06feb
|
Merge branch 'master' into docking
|
2023-09-20 12:53:35 +02:00 |
|
ocornut
|
d6360c1ba9
|
Fonts, imgui_freetype: Fixed a warning and leak in IMGUI_ENABLE_FREETYPE_LUNASVG support. (#6842, #6591)
|
2023-09-20 11:31:28 +02:00 |
|
ocornut
|
30594c37d0
|
Merge branch 'master' into docking
|
2023-08-01 10:22:21 +02:00 |
|
ocornut
|
ab490dc7b8
|
Fonts: Amends for support for OpenType SVG fonts using lunasvg (#6591, #6607)
|
2023-08-01 10:18:30 +02:00 |
|
sakiodre
|
2ad8c60abc
|
Fonts: Added support for OpenType SVG fonts using lunasvg (#6591, #6607)
|
2023-08-01 09:32:17 +02:00 |
|
Johel Ernesto Guerrero Peña
|
556ce9f543
|
imgui_stdlib: Fix warning (#6658)
|
2023-07-28 14:15:10 +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
|
677c7b2258
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# docs/CHANGELOG.txt
# docs/TODO.txt
|
2023-07-04 14:58:03 +02:00 |
|
sakiodre
|
dcdb145713
|
Docs: Fix outdated link in freetype docs (#6568)
|
2023-07-04 12:23:13 +02:00 |
|
ocornut
|
aec062a8a5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# examples/example_win32_directx9/main.cpp
# imgui_internal.h
|
2023-04-11 16:16:17 +02:00 |
|
Michael Martz
|
506f7e0074
|
Using nullptr in locations where warning disable is not convenient. (#6313, #4537)
|
2023-04-11 11:33:50 +02:00 |
|