ocornut
|
a9cd0f5e42
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_allegro5.cpp
# backends/imgui_impl_allegro5.h
# backends/imgui_impl_android.cpp
# backends/imgui_impl_android.h
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl2.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2024-12-11 12:27:25 +01:00 |
|
ocornut
|
921c22f5ad
|
Examples: GLFW+OpenGL3, SDL3+OpenGL3: Provide ES3 context creation code + failure handling. (#8197)
Untested for GLFW example.
|
2024-12-09 12:56:38 +01:00 |
|
Thomas Hope
|
6b348622bb
|
Examples: SDL2+OpenGL3: Provide ES3 context creation code + failure handling. (#8197)
|
2024-12-09 12:53:31 +01:00 |
|
bmarques1995
|
53dd7552dc
|
Backends: DX12: let the user specifies the DepthStencilView format. (#8217)
This is particullarly important for those who use RenderPasses.
|
2024-12-09 12:23:09 +01:00 |
|
ocornut
|
566558b17c
|
Replacing NULL with nullptr in examples/backends when they creeped back. (#6313, #7071, #4537)
|
2024-12-05 12:25:02 +01:00 |
|
ocornut
|
ff2d6815ef
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-12-04 19:56:35 +01:00 |
|
ocornut
|
9b27329437
|
Comments on ImageButton(). (#8165) + comments on Emscripten -sSINGLE_FILE option. (#8153)
|
2024-11-25 19:11:40 +01:00 |
|
ocornut
|
cdf21f6773
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2024-11-21 14:52:04 +01:00 |
|
ocornut
|
40b2286d16
|
(Breaking) Backends: DX12: changed ImGui_ImplDX12_Init() signature. Added ImGui_ImplDX12_InitInfo. Added support for Srv allocators.
Ref 7708
|
2024-11-15 19:15:25 +01:00 |
|
ocornut
|
3260ea6954
|
Examples: Win32+DX12: Tweaks.
|
2024-11-15 17:29:43 +01:00 |
|
ocornut
|
8082a84903
|
Examples: Win32+DX12: removed misleading parameters to RenderPlatformWindowsDefault(): the parameter is ignored by ImGui_ImplDX12_RenderWindow().
|
2024-11-15 17:12:05 +01:00 |
|
ocornut
|
83660e37e3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glut.cpp
# backends/imgui_impl_glut.h
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_demo.cpp
|
2024-11-06 17:58:35 +01:00 |
|
ocornut
|
f77d22837c
|
Examples: Android+OpenGL: Using ALooper_pollOnce() instead of ALooper_pollAll(). (#8013)
|
2024-11-04 14:24:54 +01:00 |
|
ocornut
|
646df39003
|
Examples: added SDL3+Vulkan example - enable multi-viewports. (#8084, #8085)
|
2024-10-24 18:18:42 +02:00 |
|
ocornut
|
942b64abfc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-10-24 18:15:51 +02:00 |
|
ocornut
|
ccb6646bae
|
Examples: added SDL3+Vulkan example. (#8084, #8085)
|
2024-10-24 18:09:27 +02:00 |
|
ocornut
|
1039b7f543
|
Examples: added more build_win64.bat helpers.
|
2024-10-24 18:09:25 +02:00 |
|
ocornut
|
514a97a9b7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx11.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx12.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdlrenderer2.cpp
# backends/imgui_impl_sdlrenderer2.h
# backends/imgui_impl_sdlrenderer3.cpp
# backends/imgui_impl_sdlrenderer3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
2024-10-14 19:23:23 +02:00 |
|
ocornut
|
92b94980c6
|
(Breaking) Default ImTextureID to use a Im64 instead of void* (#1641)
|
2024-10-08 14:21:44 +02:00 |
|
ocornut
|
19b494df89
|
Examples: DirectX12: update Windows SDK version.
(VS2015 doesn't support latest)
|
2024-10-08 12:38:02 +02:00 |
|
ocornut
|
10fe2b674a
|
Merge branch 'master' into docking
|
2024-09-20 18:43:48 +02:00 |
|
ocornut
|
0af2c4ef76
|
Backends: SDL3: Update for API changes: SDL_bool removal. SDL_INIT_TIMER removal. (#7999)
|
2024-09-19 16:02:23 +02:00 |
|
ocornut
|
ae8688974b
|
Merge branch 'master' into docking
|
2024-09-17 21:08:03 +02:00 |
|
Aaron C Gaudette
|
1ac162f2b0
|
Backends: WGPU: add IMGUI_IMPL_WEBGPU_BACKEND_DAWN/IMGUI_IMPL_WEBGPU_BACKEND_WGPU to support more targets. (#7977, #7969, #6602, #6188, #7523)
|
2024-09-16 16:26:13 +02:00 |
|
ocornut
|
8326dabe5e
|
Merge branch 'master' into docking
|
2024-09-12 23:19:26 +02:00 |
|
Yan Pujante
|
ac2ad79812
|
Backends: GLFW+Emscripten: use OSX behaviors automatically when using contrib glfw port. (#7965, #7915)
|
2024-09-12 19:50:50 +02:00 |
|
ocornut
|
7694e89e89
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-09-09 16:54:40 +02:00 |
|
ocornut
|
e3cb016328
|
CI: upgrade Ubuntu version to get newer Clang. Add C++26 build test. (#7954)
|
2024-09-05 15:15:49 +02:00 |
|
ocornut
|
f63c95a076
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-09-04 16:58:44 +02:00 |
|
ocornut
|
4832027eb6
|
Examples: SDL3: Update for API changes: SDL_Init() returns 0 on failure.
|
2024-09-03 19:11:51 +02:00 |
|
ocornut
|
4fc187dc60
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-08-23 19:19:22 +02:00 |
|
BillKek
|
088e6fc047
|
Examples: Win32+OpenGL3: added batch. file for msys2/mingw build. (#6544)
|
2024-08-23 14:19:36 +02:00 |
|
ocornut
|
24b077c7f8
|
Merge branch 'master' into docking (multi-viewport broken until next commit)
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-08-19 14:44:35 +02:00 |
|
lunarlattice
|
45e7f7827a
|
Examples: SDL2+SDLRenderer: fixed return value. (#7876)
|
2024-08-09 12:27:38 +02:00 |
|
ocornut
|
d8c98c8c14
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
|
2024-08-01 19:07:53 +02:00 |
|
Mark Jansen
|
5e7dc72c92
|
Examples: SDL3: Update readme to use SDL3_DIR (#7846)
|
2024-08-01 00:04:34 +02:00 |
|
ocornut
|
fd57b252ac
|
Examples: Fix for Emscripten. GLFW+WGPU: rework examples main loop to handle minimization. (#7844)
Amend 8874787, 71ee2ce
Amend ea39841f (emscripten_mainloop_stub.h)
|
2024-07-31 17:47:38 +02:00 |
|
ocornut
|
71ee2ce367
|
Examples: GLFW: rework examples main loop to handle minimization without burning CPU or GPU by running unthrottled code. (#7844)
Backends: GLFW: added ImGui_ImplGlfw_Sleep() helper.
|
2024-07-31 17:33:24 +02:00 |
|
ocornut
|
887478793b
|
Examples: SDL2 (all), SDL3 (all), Win32+OpenGL3: Rework examples main loop to handle minimization without burning CPU or GPU by running unthrottled code. (#7844)
|
2024-07-31 17:11:13 +02:00 |
|
ocornut
|
139e99ca37
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2024-07-30 16:57:42 +02:00 |
|
SPeak
|
1f634f1d94
|
Eaxmples: Android: Fix build failed issue. (#7832)
set android:exported to true (IntentFilter)
Signed-off-by: Sunrisepeak <speakshen@163.com>
|
2024-07-29 23:55:02 +02:00 |
|
ocornut
|
5ea96c15cd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_win32.cpp
|
2024-07-15 11:21:18 +02:00 |
|
ocornut
|
c3c90b49e0
|
Examples: SDL3+OpenGL: Update for API changes: SDL_GL_DeleteContext() renamed to SDL_GL_DestroyContext().
|
2024-07-11 18:13:42 +02:00 |
|
Yan Pujante
|
2937339c17
|
Backends: GLFW+Emscripten: Added support for GLFW3 contrib port. (#7647)
|
2024-07-08 22:06:24 +02:00 |
|
Yan Pujante
|
6816789a6b
|
Backends: GLFW+Emscripten: (Breaking) Renamed ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback() to ImGui_ImplGlfw_InstallEmscriptenCallbacks(), added GLFWwindow* parameter. (#7647, #7600)
+ Fixed Emscripten warning when using mouse wheel on some setups.
|
2024-07-08 22:02:48 +02:00 |
|
ocornut
|
3f61da7e8b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-07-02 17:48:38 +02:00 |
|
ocornut
|
a489585f84
|
Backends: SDL3: Updated comments (IME seems fixed in SDL3). Added SDL3 examples to Visual Studio solution.
|
2024-07-02 11:37:18 +02:00 |
|
ocornut
|
3369cbd277
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
|
2024-07-01 17:10:12 +02:00 |
|
ocornut
|
67216910fb
|
Examples: SDL3: Remove use of SDL_HINT_IME_NATIVE_UI.
|
2024-07-01 12:10:54 +02:00 |
|
ocornut
|
138d9d0c21
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
|
2024-06-28 16:03:49 +02:00 |
|