Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 04:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	imgui_demo.cpp
This commit is contained in:
omar
2019-01-17 13:59:23 +01:00
parent 9391a97fbf 872477548b
commit e9c625a1dc
14 changed files with 180 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/CHANGELOG.txt
View File

@ -30,6 +30,7 @@ HOW TO UPDATE?
-----------------------------------------------------------------------
<<<<<<< HEAD
VIEWPORT BRANCH (In Progress)
-----------------------------------------------------------------------
@ -71,12 +72,20 @@ Other changes:
-----------------------------------------------------------------------
VERSION 1.68
=======
VERSION 1.68 (In progress)
>>>>>>> master
-----------------------------------------------------------------------
Other Changes:
- Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created
in a different thread. (#1951, #2087, #2156, #2232) [many people]
- Added .editorconfig file for text editors to standardize using spaces. (#2038) [@kudaba]
- 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]
- Fonts: imgui_freetype: Added support for imgui allocators + custom FreeType only SetAllocatorFunctions. (#2285) [@Vuhdo]
- Examples: Win32: Using GetForegroundWindow()+IsChild() instead of GetActiveWindow() to be compatible with windows created
in a different thread or parent. (#1951, #2087, #2156, #2232) [many people]
- Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
- Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288, #2230)
-----------------------------------------------------------------------