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

63 Commits (5d87ee8d82cbf0c24ab766edca3f424288a2857a)

Author SHA1 Message Date
omar e2c1f0a7cd Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 5 years ago
omar 516c3dee80 Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632) 5 years ago
omar 431aa4e456 Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while. 5 years ago
omar dfb82d5c22 Merge branch 'master' into docking 
# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp
 6 years ago
omar 6789ea3482 Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484). 6 years ago
David Amador 994a92d79d Added support to use controllers via SDL_GameController. (#2509) 
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
 6 years ago
omar f159eb35fb Examples: SDL: Removed unused code. (#2484) 6 years ago
omar b89202824e Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
 6 years ago
omar 35cbf9c052 Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings. 6 years ago
omar cf029b3e1c Merge branch 'master' into docking 6 years ago
omar 42423d5ea4 Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297) 6 years ago
omar 49fb8e6c45 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp
 6 years ago
omar da035ced97 InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467) 
+ Fix some output filename in SDL build batch files.
 6 years ago
omar 3eedb542a6 Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples. 6 years ago
omar 87ded34f9f Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
 6 years ago
omar d0c98bf880 Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution. 6 years ago
omar 2cada3c143 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_widgets.cpp
 6 years ago
omar d16dbc5b87 Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. (#2306, #1676) [@rasky] 6 years ago
omar f94af2f5c5 Merge branch 'viewport' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp
 6 years ago
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
 6 years ago
omar 2c38b32db1 Removed trailing spaces (#2038, #2299) 6 years ago
omar ce1626a51e Merge branch 'viewport' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 6 years ago
omar a71d3c8cb3 Viewport: Misc comments following user feedbacks.. 6 years ago
omar 81a2546cea Merge branch 'viewport' into docking 
# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_win32_directx9/main.cpp
 6 years ago
omar ee5560a958 Merge branch 'master' into viewport + added style tweak block when viewports are enabled 
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp
 6 years ago
omar d5b22fb635 Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation. 6 years ago
omar 62cfdceac1 Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. (#1542) 6 years ago
omar b8d9c5c130 Merge branch 'viewport' into docking 
# Conflicts:
#	imgui.cpp
 6 years ago
omar 12a1e7d04e Viewport: Comment to suggest making WindowBg opaque when viewports are enabled. 6 years ago
omar 4a43f347bb Merge branch 'viewport' into docking 
# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_marmalade/main.cpp
 6 years ago
omar a3d6554e8e Merge branch 'master' into viewport + specific changes for GLFW callbacks 
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_glfw.cpp
 6 years ago
omar 9d155c73bc Examples: Misc comments mainly related to GLFW callbacks. (#1759) 6 years ago
omar a419d46205 Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178) 6 years ago
omar 565af90958 Merge branch 'viewport' into docking 6 years ago
omar 131bf5ee4a Examples: SDL: Tweaked Windows instructions and batch files. (#2175) 6 years ago
omar 5ea08394f5 Examples: SDL: Tweaked Windows instructions and batch files. (#2175) 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 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 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 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
omar e5f2295398 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 6 years ago
luk1337 e3eb4111cc Examples: Fix 'How to build' instructions for SDL2 examples (#2012) 6 years ago