omar
|
cb9a6b8a8b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/README.txt
# imgui.cpp
|
2019-01-21 16:52:22 +01:00 |
|
omar
|
f14f93ef6e
|
Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.
|
2019-01-21 16:50:27 +01:00 |
|
omar
|
28901dd104
|
Internals: Tweaks. Comments about PushID/GetID public function.
|
2019-01-21 16:50:27 +01:00 |
|
omar
|
f994b8aab8
|
ImHash: Moved crc32 table out of the function so it can be shared, also avoid cases were compiler tries to makes its initialization thread-safe.
|
2019-01-21 16:50:27 +01:00 |
|
Thomas Ruf
|
1e4cf67a53
|
avoid floating point exception when _EM_OVERFLOW is enabled (#2303)
|
2019-01-21 16:43:07 +01:00 |
|
omar
|
2d21a64fed
|
Comments
|
2019-01-21 14:25:13 +01:00 |
|
omar
|
ea7206fd4f
|
Fixed using imgui_freetype.cpp in unity builds. (#2302)
|
2019-01-21 13:58:29 +01:00 |
|
omar
|
54ba8a643e
|
Removed trailing spaces from text files. (#2038, #2299)
|
2019-01-20 22:23:29 +01:00 |
|
omar
|
00ffdb9fa9
|
ImGuiTextBuffer: Added append() function (unformatted).
|
2019-01-20 22:21:26 +01:00 |
|
omar
|
f94af2f5c5
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
|
2019-01-20 22:13:35 +01:00 |
|
omar
|
8079344cee
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2019-01-20 22:12:06 +01:00 |
|
omar
|
259f3c78a2
|
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. (#2297)
|
2019-01-20 18:13:39 +01:00 |
|
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
2019-01-20 17:56:17 +01:00 |
|
omar
|
e837099b67
|
Update for stb_ files. (#2038)
|
2019-01-20 17:51:51 +01:00 |
|
omar
|
f94ba546ba
|
Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)
|
2019-01-20 17:46:00 +01:00 |
|
Ryan Mast
|
8a63c72ac4
|
Fix the year for screenshot gallery part 7 and 8 links (#2298)
|
2019-01-19 20:45:17 +01:00 |
|
omar
|
fcd61e0c59
|
Comments about DLL boundaries and using TLS variables for GImGui. (#2292)
|
2019-01-18 23:04:45 +01:00 |
|
omar
|
82e31d34f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
|
2019-01-18 12:31:33 +01:00 |
|
omar
|
92d29531fa
|
Qt links
|
2019-01-18 11:34:25 +01:00 |
|
omar
|
295ada0364
|
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
|
2019-01-17 18:30:15 +01:00 |
|
omar
|
b8020032f9
|
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. (#2264)
|
2019-01-17 16:55:23 +01:00 |
|
omar
|
bebb07f12d
|
ImFontAtlas: Added 0x2000-0x206F general punctuation range to default ChineseFull/ChineseSimplifiedCommon ranges. (#2093)
|
2019-01-17 16:48:11 +01:00 |
|
omar
|
acdb4823dd
|
Examples: Win32: Fix for older Windows SDK.
|
2019-01-17 14:35:26 +01:00 |
|
omar
|
b5144e477f
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-01-17 14:06:42 +01:00 |
|
omar
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
2019-01-17 14:05:40 +01:00 |
|
omar
|
872477548b
|
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. (#1951, #2087, #2156, #2232)
|
2019-01-17 11:45:32 +01:00 |
|
Gilad Reich
|
14c40242db
|
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288, #2290)
|
2019-01-17 11:39:40 +01:00 |
|
omar
|
f2c92808f8
|
EditorConfig: Further tweaks (#2038)
|
2019-01-16 22:02:42 +01:00 |
|
Chris Savoie
|
83810039d1
|
Add editor config for 4 spaces instead of tab.
|
2019-01-16 22:00:33 +01:00 |
|
omar
|
8cbb91261e
|
ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery]
+ Demo tweaks
|
2019-01-16 17:47:49 +01:00 |
|
omar
|
d1851ed6b7
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]
|
2019-01-16 16:19:38 +01:00 |
|
omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:13:23 +01:00 |
|
omar
|
06aaf23877
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:10:51 +01:00 |
|
omar
|
882f1bc135
|
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
|
2019-01-16 15:10:31 +01:00 |
|
omar
|
2f9bae140b
|
Docking: Demo: Fixed docking document window into parent window. (#2286)
|
2019-01-16 14:43:27 +01:00 |
|
omar
|
09f1cb642b
|
FreeType: Minor tweaks previous commit (#2285)
|
2019-01-15 21:50:43 +01:00 |
|
alexey_skryabin
|
daac9c7559
|
By default ImGuiFreeType will use ImGui::MemAlloc()/MemFree().
ImGuiFreeType::SetAllocatorFunctions() can be used to specify custom allocator.
|
2019-01-15 21:47:46 +01:00 |
|
omar
|
8a45c56c2c
|
Merge branch 'viewport' into docking
|
2019-01-15 21:22:29 +01:00 |
|
omar
|
9391a97fbf
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
|
2019-01-15 21:22:21 +01:00 |
|
omar
|
79d497edae
|
Viewport: Made platform_io.Monitors mandatory for proper multi-viewport use.
|
2019-01-15 21:20:00 +01:00 |
|
omar
|
f435aa193b
|
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
|
2019-01-15 21:19:02 +01:00 |
|
omar
|
133f112af0
|
Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. (#1951, #2087, #2156, #2232) [many people]
|
2019-01-15 20:27:32 +01:00 |
|
omar
|
95ee99e6aa
|
Version 1.68 WIP
|
2019-01-15 20:19:05 +01:00 |
|
omar
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
2019-01-15 15:14:16 +01:00 |
|
omar
|
73353fad64
|
Merge branch 'master' into viewport
|
2019-01-15 15:13:29 +01:00 |
|
omar
|
d38d7c6628
|
TODO update + internals: changed order or ImGuiLayoutType enums to allow using them for indexing.
|
2019-01-15 15:06:24 +01:00 |
|
omar
|
b8c6e31c2d
|
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)
|
2019-01-15 15:05:56 +01:00 |
|
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
2019-01-14 21:30:07 +01:00 |
|
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
2019-01-14 21:30:01 +01:00 |
|
omar
|
7a5058e3bf
|
Version 1.67
|
2019-01-14 17:41:44 +01:00 |
|