Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-19 06:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Fixed various conflicts not properly resolved on 813e0c1

Browse Source 
New git client confusion.
This commit is contained in:
omar 2019-11-27 19:27:44 +01:00
parent 4dff49b2f1
commit 28dd8d7efd
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.txt
View File

@ -30,7 +30,6 @@ HOW TO UPDATE?
----------------------------------------------------------------------- -----------------------------------------------------------------------
<<<<<<< HEAD
DOCKING BRANCH (In Progress) DOCKING BRANCH (In Progress)
----------------------------------------------------------------------- -----------------------------------------------------------------------
@ -100,10 +99,7 @@ Other changes:
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.74 WIP (In Progress)
=======
VERSION 1.74 (Released 2019-11-25) VERSION 1.74 (Released 2019-11-25)
>>>>>>> master
----------------------------------------------------------------------- -----------------------------------------------------------------------
Breaking Changes: Breaking Changes:

4
examples/imgui_impl_dx9.h
View File

@ -3,12 +3,8 @@
// Implemented features: // Implemented features:
// [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as ImTextureID. Read the FAQ about ImTextureID! // [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as ImTextureID. Read the FAQ about ImTextureID!
<<<<<<< HEAD
// [X] Renderer: Multi-viewport support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. // [X] Renderer: Multi-viewport support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'.
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices.
=======
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. // [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
>>>>>>> master
// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. // You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. // If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp.

6
examples/imgui_impl_metal.mm
View File

@ -3,13 +3,9 @@
// Implemented features: // Implemented features:
// [X] Renderer: User texture binding. Use 'MTLTexture' as ImTextureID. Read the FAQ about ImTextureID! // [X] Renderer: User texture binding. Use 'MTLTexture' as ImTextureID. Read the FAQ about ImTextureID!
<<<<<<< HEAD // [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices.
// Missing features: // Missing features:
// [ ] Renderer: Multi-viewport / platform windows. // [ ] Renderer: Multi-viewport / platform windows.
=======
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
>>>>>>> master
// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. // You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. // If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp.

6
examples/imgui_impl_vulkan.cpp
View File

@ -2,12 +2,8 @@
// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) // This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..)
// Implemented features: // Implemented features:
<<<<<<< HEAD
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices.
// [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport).
=======
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. // [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
>>>>>>> master // [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport).
// Missing features: // Missing features:
// [ ] Renderer: User texture binding. Changes of ImTextureID aren't supported by this binding! See https://github.com/ocornut/imgui/pull/914 // [ ] Renderer: User texture binding. Changes of ImTextureID aren't supported by this binding! See https://github.com/ocornut/imgui/pull/914