Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-17 04:17:17 +01:00
Code Releases Wiki Activity
6,334 Commits 9 Branches 125 Tags 121 MiB
992736dc5d
Commit Graph

1195 Commits

Author SHA1 Message Date
omar
992736dc5d Merge branch 'refs/heads/master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2019-12-13 17:06:27 +01:00
Rokas Kupstys
03b7170dac Backends: GLFW: Added workaround for people who use development version of GLFW which is older than commit that added required cursor support. (#2922) 2019-12-06 15:12:26 +01:00
omar
7ff13f4ee1 Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking settings 
(otherwise if another loader such as Glew is accessible, the opengl3 backend might automatically use it). [#2919, #2798]
 2019-12-06 10:43:27 +01:00
Max Thrun
6d9a54a904 Examples: Metal: Wrap main event loop body in an @autoreleasepool block to ensure allocations get freed even if underlying system event loop gets paused due to app nap (#2910, #2917) 2019-12-05 15:50:33 +01:00
omar
8342e5b91a Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4) 
Amend b5cad20d79, 945a509773
+ unrelated minor typos
 2019-12-05 15:45:30 +01:00
Rokas Kupstys
945a509773 Implement ImGuiMouseCursor_NotAllowed mouse cursor. 2019-12-05 15:32:10 +01:00
Rokas Kupstys
b5cad20d79 Implement new GLFW 3.4 resizing cursors. 2019-12-05 15:27:09 +01:00
omar
abaf0256b8 Version 1.75 WIP 
Added message to font file loading assert.
 2019-11-28 20:58:16 +01:00
omar
28dd8d7efd Docking: Fixed various conflicts not properly resolved on 813e0c1 
New git client confusion.
 2019-11-27 19:27:44 +01:00
Rokas Kupstys
bf6d1ba3d1 CI: Add 32/64 bit build variations to builds with extra warnings. 2019-11-27 16:20:19 +01:00
Rokas Kupstys
1742ca45c5 CI: Add unity builds test. (#2893) 2019-11-27 16:18:52 +01:00
omar
813e0c18e6 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_metal.h
#	examples/imgui_impl_metal.mm
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_vulkan.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2019-11-26 12:23:43 +01:00
omar
bdce833636 Version 1.74 2019-11-25 18:38:53 +01:00
omar
26d177bc03 Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks 2019-11-25 18:29:28 +01:00
Rokas Kupstys
1615e9ea2a CI: Enable extended warnings in example_null builds. 
CI: Add MinGW build with extra warnings on windows.

(cherry picked from commit ebc98c273054d0f9b305a1346db98052616a8b21)
 2019-11-25 16:38:21 +01:00
omar
ca63349eb4 Renamed XX-bits -> XX-bit in comments to match what the world appears to be using. 2019-11-20 11:58:25 +01:00
omar
4e90906b04 Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734) 
Using in Emscripten example.
 2019-11-19 21:14:44 +01:00
omar
69b5c2f541 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2019-11-08 15:45:12 +01:00
omar
3929255b77 Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. (#2877, #2878) [@podsvirov] 2019-11-05 12:53:30 +01:00
Konstantin Podsvirov
916487a653 example_emscripten: skip outdated compiler option 
For more info see: https://github.com/ocornut/imgui/issues/2877
 2019-11-05 12:43:15 +01:00
omar
a704614b3e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2019-11-04 16:33:57 +01:00
Rokas Kupstys
c9182424a8 Normalize all the line endings. 
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
 2019-11-04 15:28:31 +01:00
omar
b3e94f5de8 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
 2019-10-29 17:21:19 +01:00
omar
f002a11898 Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. (#2866, #2852) [@dpilawa] 2019-10-25 11:56:44 +02:00
dawid
4d0c88e9e6 Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. (#2866, #2852) 2019-10-25 11:42:55 +02:00
omar
0cbb96895a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
 2019-10-24 15:11:37 +02:00
Funto
75d540d336 Example: Emscripten: Fix for compilation (filesystem module is required) (#2734) 2019-10-23 16:55:26 +02:00
omar
048b73dfaa Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code. 2019-10-21 20:57:07 +02:00
omar
7b77cb3bb8 Backend: DX12: Fixed incorrect assert (#2851) 2019-10-21 13:38:33 +02:00
omar
6ffee0e75e Backends: DX12: Added extra ID3D12DescriptorHeap parameter to ImGui_ImplDX12_Init() function. The value is unused in master branch but will be used by the multi-viewport features (docking branch). (#2851) 
+ Using SafeRelease() in master.
 2019-10-18 18:32:48 +02:00
omar
6faad0c34f Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. (#2851) 
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
 2019-10-18 18:21:44 +02:00
Ilya.Sevrikov
05c1f2795a Add multi-viewports for DX12. (#2851) 
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
 2019-10-18 18:21:35 +02:00
omar
eedc8f993f Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled. 2019-10-18 18:20:53 +02:00
omar
7feccf9ab2 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	imgui.cpp
 2019-10-18 16:50:30 +02:00
malte-v
4de32cc87e Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down (#2836) 2019-10-18 16:27:40 +02:00
omar
53278be61f FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey. 2019-10-18 16:18:05 +02:00
omar
3bbc27ebd9 Fixed more FAQ links. (#2848) 2019-10-16 11:23:15 +02:00
Rokas Kupstys
9d6b2b096b Ignore directories created by JetBrains IDEs. 
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
 2019-10-15 17:15:45 +02:00
Rokas Kupstys
6892b81578 Remove trailing spaces from bunch of files. 
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
 2019-10-15 16:04:02 +02:00
omar
fc10ba8d24 Amend f0238ece9c (#2817, #2818) 2019-10-11 14:20:04 +02:00
Egor Yusov
378035c6ff Fixed backspace handling on MacOS (fixed https://github.com/ocornut/imgui/issues/2817). 
Allow null view passing as parameter to ImGui_ImplOSX_NewFrame
 2019-10-11 14:17:07 +02:00
omar
bf4880f6a2 Merge branch 'master' into docking 2019-10-07 19:14:37 +02:00
Harris Brakmic
323412dd23 Examples: Allegro5: updated build instructions for macOS 2019-10-07 15:52:09 +02:00
omar
e0c0e53edf Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2019-10-04 19:22:42 +02:00
omar
a2f3dcfc97 Added comment about SDL and SDL_INIT_GAMECONTROLLER. (#2809) 2019-10-02 11:40:03 +02:00
omar
c262276988 Version 1.74 WIP 2019-09-30 14:27:56 +02:00
Konstantin Podsvirov
f0f5301612 Backends: OpenGL3: Commented out extra tokens at end of #else directive (#2804) 2019-09-25 00:06:14 +02:00
omar
6994bf10bc Merge branch 'master' into docking + fix for RenderMouseCursor() 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_internal.h
 2019-09-24 17:14:51 +02:00
omar
d5efe16157 Version 1.73 2019-09-24 17:02:26 +02:00
omar
97691643b7 Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3 (#2798) 2019-09-22 23:19:04 +02:00