8baa4ccff5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
53dfccbe4b
imgui_freetype: Fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails. ( #618 )
5 years ago
b8e2b2bd6b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
832fda8488
Fixed stray end of line blanks, added comments in .editorconfig, tweaked some headers.
5 years ago
3930472f34
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
cc0d4e346a
Misc: Added an explicit compile-time test for non-scoped IM_ASSERT() macros to redirect users to a solution + fixed our stb wrappers.
...
+ Nav: Use nav layer enum, comments.
5 years ago
16a9488c13
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
5 years ago
2fd411a83e
Support custom stb_rect_pack filename in Freetype ( #3062 )
...
Copies the #define magic from imgui_draw.cpp to the imgui_freetype implementation to allow the use of a custom stb rect_pack here as well.
References: fe5347ef94
5 years ago
339ffd25a9
Internals: Renamed ImBoolVector to ImBitVector, added low-level loose function to replicate the behavior include a help SetBitRange() function.
5 years ago
bb1e6f8af6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
5 years ago
d16c87a5b1
Internals: Minor renaming
5 years ago
44174b1fa1
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
5 years ago
4b3c5ff5f1
Comments + minor moving
5 years ago
f03c00bc89
Added imgui_single_file.h, We use this to validate compiling all *.cpp in same compilation unit.
...
Removed Unity builds stuff from example_null/. CI builds a temporary .cpp file.
5 years ago
813e0c18e6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
5 years ago
bdce833636
Version 1.74
5 years ago
26d177bc03
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
5 years ago
ca63349eb4
Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.
5 years ago
b3e94f5de8
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
5 years ago
c863c1f6a1
Clean up number rounding. Now it is more obvious what code is doing. ( #2862 )
...
Add IM_ROUND() macro
Replace IM_FLOOR(n + 0.5f) and ImFloor(n + 0.5f) with IM_ROUND(n)
5 years ago
4e56de757c
Doc: Promote Discord over Discourse. Obsoleting Discourse server.
5 years ago
7feccf9ab2
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
5 years ago
714fe29d1a
Replace manual flooring with IM_FLOOR() macro. ( #2850 )
...
Macro is used to ensure that flooring operation is always inlined even in debug builds. __forceinline does not force inlining in /Od builds with MSVC.
(cherry picked from commit bc165df6fd7969605bbc07b8a6d3d28f9109e8f3)
5 years ago
3bbc27ebd9
Fixed more FAQ links. ( #2848 )
5 years ago
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
c262276988
Version 1.74 WIP
5 years ago
6994bf10bc
Merge branch 'master' into docking + fix for RenderMouseCursor()
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
5 years ago
d5efe16157
Version 1.73
5 years ago
aedcd2fb1a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
5 years ago
f624455d7b
Version 1.73 WIP
6 years ago
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
6a0d0dab5a
Version 1.72b (patch for nav)
6 years ago
9183e7c426
Version 1.73 WIP
6 years ago
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
ecb9b1e2eb
Version 1.72
6 years ago
db2581bee9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
1820aaf444
imgui_freetype: Initialize FT_MemoryRec_ struct manually ( #2686 )
...
This fixes gcc warning: missing field 'alloc' initializer [-Wmissing-field-initializers]
6 years ago
56e10f1c35
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
718e15c7de
Docking: Fix so that an appearing window making a dock node reappear won't have a zero-size on its first frame (because dock node ->Size was 0.0 unlike ->SizeRef) ( #2109 )
...
Docking: Added ImGuiDockNode to .natvis file.
6 years ago
d23f1b1409
fonts/binary_to_compress: display error message when failing to open file + misc comments.
6 years ago
4b95e7c2f3
Doc: Tweak and extra mention of AddCustomRectFontGlyph + made the example register two rectangles.
6 years ago
e9b92d1cef
Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. ( #2618 )
...
+ Fix version number in imgui.h
6 years ago
5286ecb8a7
Version 1.72 WIP
6 years ago
2da1c66d15
Version 1.71 + comments
6 years ago
4597632662
Readme, comments, dear imgui prefixes
6 years ago
c487bc52a2
Fonts: Added some details about using custom colorful icons.
6 years ago
87c5356d97
FreeType: Added RasterizerFlags::Monochrome flag to disable font anti-aliasing. ( #2545 ) Combine with RasterizerFlags::MonoHinting for best results.
6 years ago
42fc563fed
Version 1.71 WIP + fixed minor typo
6 years ago
d1d5075b66
Version 1.70
6 years ago
c8fd4afd75
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
6 years ago
ocornut
David Kalnischkies
Rokas Kupstys
luk1337
HolyBlackCat