ocornut
|
edf522b58a
|
Merge branch 'master' into docking + amends change to nullptr (#5760)
# 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_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui_internal.h
|
2022-10-11 15:59:23 +02:00 |
|
cfillion
|
5884219867
|
imgui_freetype: Assert if bitmap size exceed chunk size to avoid buffer overflow. (#5731)
|
2022-09-30 16:12:51 +02:00 |
|
ocornut
|
e900ca355e
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui.h
|
2022-06-10 19:29:17 +02:00 |
|
Rokas Kupstys
|
74f7ac04a1
|
Misc: Fix font compressor utility warnings. (#5359)
|
2022-05-31 14:25:40 +02:00 |
|
ocornut
|
6b5a2426d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2022-05-17 11:59:32 +02:00 |
|
BttrDrgn
|
4db55f88e8
|
Changed FONT.md edit to blob (#5290)
Stop from opening the editor for freetype/README.md
|
2022-05-06 09:47:18 +02: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
|
fd06ed833b
|
Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104)
|
2022-03-13 17:57:32 +07:00 |
|
ocornut
|
9948535118
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
2022-02-17 18:47:43 +01:00 |
|
Konstantin Podsvirov
|
7ff41a78f9
|
Fonts: binary_to_compressed_c.cpp gained -nostatic option (#5021)
This allow to use added variables in other source files via extern declaration.
|
2022-02-16 17:02:33 +01:00 |
|
ocornut
|
d378e4088f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
2022-02-01 15:46:42 +01:00 |
|
Clownacy
|
422902dbda
|
Correct typos (#4954, #4955), use IM_STATIC_ASSERT now that old pre-C++11 macro has been obsoleted.
|
2022-01-31 11:58:33 +01:00 |
|
ocornut
|
dc8c3618e8
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2021-11-10 15:26:03 +01:00 |
|
ocornut
|
ebac375791
|
Docs: added info about Freetype, editing sponsors.
|
2021-11-08 16:22:00 +01:00 |
|
ocornut
|
dedb381c51
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
|
2021-08-30 20:01:16 +02:00 |
|
ocornut
|
68f428b449
|
imgui_freetype: Fixed crash when FT_Render_Glyph() returns NULL (which apparently happens with Freetype 2.11). (#4394, #4145 ?)
|
2021-08-23 16:42:58 +02:00 |
|
ocornut
|
a11f36811f
|
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_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
2021-07-09 20:16:19 +02:00 |
|
ocornut
|
327a5d8253
|
Fix warning + apply trailing whitespaces in stb_ libs (as applied on nothings/stb on 2020/02/02, facilitating further diffs)
|
2021-07-05 17:52:44 +02:00 |
|
ocornut
|
ac35b4bba2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2021-06-24 18:21:19 +02:00 |
|
ocornut
|
e534c56485
|
Fonts: Functions with a 'float size_pixels' parameter can accept zero if it is set in ImFontSize::SizePixels.
|
2021-06-24 17:15:14 +02:00 |
|
ocornut
|
20d415e939
|
FIx static analysers warnings and disable false positives.
|
2021-06-24 17:15:14 +02:00 |
|
ocornut
|
4161a67b38
|
ImVector: added clear_delete(), clear_destruct() helpers.
# Conflicts:
# imgui.cpp
|
2021-06-09 18:44:02 +02:00 |
|
ocornut
|
d0c6dd9baf
|
ImVector: added clear_delete(), clear_destruct() helpers.
|
2021-06-09 16:57:47 +02:00 |
|
ocornut
|
a44d4da87c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
2021-06-08 18:38:51 +02:00 |
|
ocornut
|
020d1ced1d
|
Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.
|
2021-06-08 17:10:24 +02:00 |
|
ocornut
|
1b435ae3e0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2021-05-24 17:49:20 +02:00 |
|
ocornut
|
c708299ca9
|
Docs: Improvements to description of using colored glyphes/emojis. (#4169, #3369) + Add Fonts to Metrics. Removed IMGUI_HAS_TABLE markers.
|
2021-05-24 13:07:26 +02:00 |
|
ocornut
|
81e0b18e38
|
Merge branch 'master' into docking
|
2021-03-16 16:10:29 +01:00 |
|
ANF-Studios
|
ebe6ac5fb5
|
Improvements to minor mistakes in documentation comments (#3923)
|
2021-03-16 12:44:16 +01:00 |
|
ocornut
|
256594575d
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2021-03-15 20:38:34 +01:00 |
|
Rokas Kupstys
|
1bc6f82091
|
Misc: added imgui.gdb and imgui.natstepfilter debugger helpers for gdb and msvc.
|
2021-03-12 17:03:16 +01:00 |
|
ocornut
|
f1bf642e8f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
|
2021-03-11 16:32:14 +01:00 |
|
ocornut
|
fdc2324d9a
|
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
|
2021-03-11 16:21:46 +01:00 |
|
ocornut
|
80533ea5e1
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2021-03-05 16:04:15 +01:00 |
|
TAiGA
|
f5bc5e8630
|
Freetype: Enable FreeType bitmap glyphs. (#3879)
|
2021-03-05 14:25:27 +01: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
|
23ab4978e4
|
ImFontAtlas: Added 'bool TexPixelsUseColors' output to help backend decide of underlying texture format. (#3369, #3844)
|
2021-03-02 15:04:34 +01:00 |
|
ocornut
|
239d09804d
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2021-02-10 21:28:16 +01:00 |
|
ocornut
|
4df57136e9
|
Version 1.81
|
2021-02-10 21:16:58 +01:00 |
|
ocornut
|
7a516a266d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2021-02-09 13:17:24 +01:00 |
|
ocornut
|
24be26e00e
|
imgui_freetype: Add support for colored glyphs. Font: add support for untinted glyphs (#3369)
Amend 9499afd with missing static inline.
|
2021-02-01 16:32:26 +01:00 |
|
Petr Shurgalin
|
24aa6654df
|
imgui_freetype: add support for colored glyphs with ImGuiFreeTypeBuilderFlags_LoadColor (#3369)
(squashed 4 commits)
|
2021-02-01 16:32:23 +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 |
|
ocornut
|
9499afdf5e
|
imgui_freetype: clarify breaking changes, and add BuildFontAtlas() to be consistent with planned obsolescence. Rename mislabelled internal helper. Demo: clarify labels in nested table demo. (#3765)
|
2021-01-28 20:53:53 +01:00 |
|
ocornut
|
3867c6c5f0
|
Fonts: (Breaking) Rename ImGuiFreeType:: flags to ImGuiFreeTypeBuilderFlags_XXX. Remove ImGuiFreeType::BuildFontAtlas() flags. Rename ImFontConfig::RasterizerFlags to FontBuilderFlags. Add ImFontBuilderIO (opaque). Amend 53d59f3 with a dozen of small fixes.
|
2021-01-26 17:25:09 +01:00 |
|
ocornut
|
dd4ca70b0d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
2020-12-04 19:22:15 +01:00 |
|
omar
|
182115409a
|
Internals: added ImSpan helper structure + 2020/10/01 stricter bound checking
|
2020-12-04 19:15:20 +01:00 |
|
omar
|
9c8671e7b0
|
Tables: Add empty file, skeleton.
|
2020-12-04 19:15:19 +01:00 |
|
ocornut
|
455c21df71
|
Merge branch 'master' into docking + dockspace demo comments
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
# imgui_internal.h
# imgui_widgets.cpp
|
2020-10-19 15:08:32 +02:00 |
|
ocornut
|
31a144b60c
|
Fix comments (#3534)
|
2020-10-15 19:37:18 +02:00 |
|