omar
|
7227454dca
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
|
2019-02-03 17:31:16 +01:00 |
|
omar
|
e215809c4d
|
Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
|
2019-02-01 17:06:40 +01:00 |
|
omar
|
ac6d474103
|
Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
|
2019-02-01 16:37:07 +01:00 |
|
omar
|
5fc6899dc2
|
Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). (#2329) [@BrutPitt]
|
2019-02-01 15:13:54 +01:00 |
|
omar
|
f906d53f7d
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-01-31 19:19:35 +01:00 |
|
omar
|
16c0a0217c
|
Updating supporter list.
|
2019-01-31 13:45:46 +01:00 |
|
omar
|
fb4f1ff7f6
|
InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. (#2321, #787)
|
2019-01-30 15:16:09 +01:00 |
|
omar
|
158995f271
|
InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. (#2321) [@relick]
|
2019-01-30 13:15:14 +01:00 |
|
omar
|
2ccc6d2ed1
|
Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.
|
2019-01-29 18:28:31 +01:00 |
|
omar
|
ed240c910b
|
Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. (#2318) [@bluescan]
|
2019-01-29 14:36:55 +01:00 |
|
omar
|
8a4422b2fa
|
Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. (#2308)
|
2019-01-27 23:54:17 +01:00 |
|
Marc-Alexandre Espiaut
|
8a605354ef
|
Replacing one of the third-party Python bindings. (#2312)
Removing the unmaintained CyImGui (only 7 commits, last one made in 2015) and replacing it with bimpy.
|
2019-01-27 21:59:48 +01:00 |
|
omar
|
13a5f5ba8b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-01-27 16:46:35 +01:00 |
|
omar
|
b26ac92a12
|
Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)."
This reverts commit 20bc06af70.
|
2019-01-27 16:43:56 +01:00 |
|
omar
|
20bc06af70
|
Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).
|
2019-01-27 16:18:23 +01:00 |
|
omar
|
737a3644fc
|
Removed trailing spaces (docking branch)
|
2019-01-27 14:57:07 +01:00 |
|
omar
|
e55678adec
|
Update README.md (changed e-mail address)
|
2019-01-24 18:31:31 +01:00 |
|
omar
|
a8277ca873
|
Reoder Python bindings
|
2019-01-23 20:04:08 +01:00 |
|
omar
|
07ff47bf1b
|
Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. (#2109)
|
2019-01-23 19:54:45 +01:00 |
|
omar
|
0737433c71
|
When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. (#1495, #822)
|
2019-01-23 19:24:35 +01:00 |
|
omar
|
c362a96a3f
|
When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. (#1495, #822)
|
2019-01-23 19:21:25 +01:00 |
|
omar
|
0947fa3de0
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-01-21 16:54:37 +01:00 |
|
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
|
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 |
|
Ryan Mast
|
8a63c72ac4
|
Fix the year for screenshot gallery part 7 and 8 links (#2298)
|
2019-01-19 20:45:17 +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
|
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
|
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 |
|
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
|
09f1cb642b
|
FreeType: Minor tweaks previous commit (#2285)
|
2019-01-15 21:50:43 +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
|
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
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
2019-01-14 21:30:07 +01:00 |
|