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

779 Commits (6277781e837e7419686866a03e68a7d0e7eb85b0)

Author SHA1 Message Date
omar 6277781e83 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 89e2ddf07f Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx 7 years ago
omar 569e0f07f1 Examples: Removed old example_apple/ + tweak comments (#1873) 7 years ago
Omar Cornut 839e4d34bd Merge branch 'warrenm_osx' 7 years ago
Omar Cornut c3f9220c15 Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments 7 years ago
Warren Moore d64157e803 Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873) 7 years ago
omar 7b2662d245 Examples: Comments, bits of documentation 7 years ago
omar deb7aa29cd OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873) 7 years ago
omar 0d7e779b37 Merge branch 'master' into osx 
# Conflicts:
#	examples/.gitignore
#	examples/README.txt
 7 years ago
omar a765c83bad Ignore list: added emscripten output 7 years ago
omar 770cba0bd0 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
#	imgui_internal.h
 7 years ago
Konstantin Podsvirov ddb09c6011 Examples: Ignore all *.user files (#1919) 
For example `Qt Creator` create `CMakeLists.txt.user` file with user settings.
 7 years ago
omar c4e34aaace Examples: Comments to clarify how the keyboard data is indexed. 7 years ago
codecnotsupported b62cc5c150 Fix include Example_glfw_vulkan cmake (#1916) 
Probably got broken because of the refactor.
 7 years ago
omar 62b3d7c51e Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914) 7 years ago
Aiekick ecd9a223e3 add hand cursor support (+11 squashed commit) 7 years ago
Omar Cornut 42a919f303 Examples: Apple: Fixed paths of GLFW+GL2 example. (#1906) Update ignore list. 7 years ago
omar c38fe6b0e1 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 7 years ago
omar a1ec7723ef Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings. 7 years ago
omar 20e89201cb Examples: Fixes. 7 years ago
omar d3ee3e7ab5 Fixed merge. 7 years ago
omar ce500f8727 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
 7 years ago
omar d68633398b Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings. 7 years ago
omar f9a5ff7a19 Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301) 7 years ago
omar cac4c3f9b8 Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. (#1888) + Comments in imgui.h 7 years ago
omar 528b0b4af6 Examples: SDL+OpenGL2: Fixed Makefile. (#1886) 7 years ago
omar c44a4bed84 Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. (#1887) 7 years ago
omar 2ce121b7d0 Readme, Links, Bindings 7 years ago
omar 40845852b9 Fixed warnings + readme 7 years ago
Omar Cornut a402edb66c Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873) 7 years ago
omar 9a5f742e63 Fixed merge. 7 years ago
omar 70b0bd13aa Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	imgui.cpp
#	imgui.h
 7 years ago
omar 185b4dde87 Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end. 7 years ago
omar 087ab2acbf Examples: Fixed example vcproj names in Viewport branch. 7 years ago
omar be4b8b5615 Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks. 7 years ago
omar 24aeca3d0c Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
 7 years ago
Omar Cornut e54b61aa0f Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873) 7 years ago
omar f96c7fac91 Examples: FreeGLUT: Fixed mapping of Space key. (#801) 7 years ago
omar cdf51cad2d Comments, documentation 7 years ago
omar a1b6766d43 Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. (#801) 7 years ago
omar bdb3d72d37 Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). (#1874) 7 years ago
omar 7acb46bec5 Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible (#1027). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. 7 years ago
omar fac0c801da Examples: Added imgui_impl_osx.mm bindings (#1870, #281) 7 years ago
omar 6f7b7807ad Fixed Travis path + various paths in comments/documentations 7 years ago
omar 9660657e95 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
 7 years ago
omar 5a13e4dcde Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits 7 years ago
omar 8d58fbb5ed Examples: Renamed example folders. (#1870) 7 years ago
omar 13a3a2d0f3 Merge branch 'examples_refactor2' into viewport (#1870) 
# Conflicts:
#	examples/README.txt
#	examples/directx11_example/main.cpp
#	examples/directx12_example/main.cpp
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl2.cpp
#	examples/imgui_impl_sdl2.h
#	examples/imgui_impl_vulkan.cpp
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/sdl_vulkan_example/main.cpp
#	examples/vulkan_example/main.cpp
#	imgui.cpp
#	imgui.h
 7 years ago
omar 85f9694bd4 Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). (#1870) 
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
 7 years ago
omar 24fc7c30dd Examples: Documentation 7 years ago