Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,056 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c6193d0605'
${ noResults }
Commit Graph

846 Commits (c6193d0605e2ab1aef2fb6d835b8d69936fb5908)

Author SHA1 Message Date
omar c6193d0605 Merge branch 'viewport' into docking 6 years ago
omar 6cc380fc41 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
 6 years ago
omar 788febf044 Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097) 6 years ago
omar fda57f48d5 Merge branch 'viewport' into docking 
# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
 6 years ago
omar 7abc368927 Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542) 6 years ago
omar 7c3b9172ad Examples: Referring to missing gamepad support in back-end that are missing it. 6 years ago
omar b57baa5ba0 Viewport: Enabled viewports by default in more example apps. 6 years ago
omar e32256b4b4 Merge branch 'viewport' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
 6 years ago
omar b85f345369 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
 6 years ago
omar 1afd29d382 Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo. 6 years ago
omar 9cc63ba279 Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078) 6 years ago
omar df65d4a14f Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 6 years ago
omar b872aa5c8e Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem(). 6 years ago
MindSpunk 7eadcf7d7d example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036) 6 years ago
omar a82be53407 Merge branch 'docking2' into viewport_docking 
# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 6 years ago
omar 49533bc86e Examples: Enabled Docking + Nav by default in the branch. (#351) 6 years ago
omar bdb30d7145 Merge branch 'master' into viewport 6 years ago
Jiří Šebele f8b7e4d94f Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002) 
`gladLoadGL` returns 0 on fail, not the other way around.
 6 years ago
omar fd201a90f1 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 6 years ago
omar 5d40d295b3 Comments, readme updates 6 years ago
Omar Cornut be6ea86f8d OSX: Added imgui_widgets.cpp to xcode project files. 6 years ago
omar e312363007 Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 6 years ago
omar 01586d33f3 Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 6 years ago
omar 36b2f64051 Merge branch 'master' into viewport 
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
 6 years ago
omar 1b61b6b208 Examples: Vulkan: Minor tweaks. 6 years ago
omar b127027cbd Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example. 6 years ago
Jérémie Dumas e476b7e727 WIP on configurable OpenGL loader. (#2001, #2002) 6 years ago
omar 705ff49400 Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 (#1542) 6 years ago
omar f81caac459 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui.h
 6 years ago
omar 4dea0327e7 Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections. 6 years ago
omar 0ada716184 Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. (#1542) 6 years ago
omar a4191857c1 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_vulkan.h
#	imgui.cpp
 6 years ago
omar 7268c65d73 Examples: imgui_impl_vulkan: Comments (re) 6 years ago
omar 3fdfac3377 Examples: imgui_impl_vulkan: Comments 6 years ago
omar 5d630c930d Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542) 7 years ago
omar e5f2295398 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 7 years ago
omar 421dc19798 Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015) 7 years ago
Ryan Crandall 9c0805010f imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID (#2015, #301) 7 years ago
omar d5793102db imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873) 7 years ago
Ryan Crandall 34203d5008 imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined (#2014) 7 years ago
luk1337 e3eb4111cc Examples: Fix 'How to build' instructions for SDL2 examples (#2012) 7 years ago
omar 35124cdd07 imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. (#2002, #1873) 
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
 7 years ago
omar 00e29832d4 Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. (#1996) 7 years ago
omar 8ef0ca9765 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 7 years ago
omar d69b2a1c1d Changelog for #1989 7 years ago
Matthias Moulin 6011ddf1e5 imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 (#1989) 7 years ago
omar b1fc988c6b imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. (#1941) 7 years ago
omar b217251a63 Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder) 7 years ago
omar 9824bf1ba1 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 7 years ago
omar 067edd09f9 imgui_impl_opengl3: Comments. (#1987) 7 years ago