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
|
a0b811dd37
|
Backends: SDLRenderer2/3: expose selected state in ImGui_ImplXXXX_RenderState structures during render loop. (#6969, #5834, #7468, #3590 + #7616)
|
2024-10-09 16:39:36 +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
|
6df1a06fc3
|
Merge branch 'master' into docking
|
2024-07-29 23:18:54 +02:00 |
|
ocornut
|
3f9a90e2a3
|
Docs: added extraneous link to Getting Started section.
|
2024-07-25 16:59:40 +02:00 |
|
ocornut
|
b39fc84f89
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-05-16 19:57:04 +02:00 |
|
ocornut
|
5d973a87d4
|
Backends: SDL_Renderer2/SDL_Renderer3: and ImGui_ImplSDLRenderer2_RenderDrawData() and ImGui_ImplSDLRenderer3_RenderDrawData() now takes a SDL_Renderer* parameter.
|
2024-05-15 13:44:54 +02:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
f8f805f046
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2023-07-20 23:18:47 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
823a1385a2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlrenderer.h
# docs/CHANGELOG.txt
# imgui.cpp
|
2023-05-31 14:51:56 +02:00 |
|
ocornut
|
b476184574
|
Backends: SDLRenderer3: Amend/finish SDL_Renderer3 patch + add example. (#6286)
|
2023-05-30 20:36:07 +02:00 |
|
Andrea Carcone
|
0b57c07c79
|
Backends: SDL3: Add SDL_Renderer for SDL3 implementation. (#6286)
This is mostly a duplicate of SDL2 version with a few changes:
SDL_GetRenderScale -> SDL_RenderGetScale
SDL_ScaleModeLinear -> SDL_SCALEMODE_LINEAR
|
2023-05-30 20:30:30 +02:00 |
|