ocornut
4d216d4510
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdlgpu3.cpp
2025-08-27 18:57:56 +02:00
ocornut
fe03035112
Docs: advertise ProggyVector font as an alternative.
2025-08-20 20:02:49 +02:00
ocornut
cbf9e3f554
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdlgpu3.cpp
# imgui.cpp
2025-08-08 15:51:56 +02:00
Adem Budak
d163e20f63
Examples: Win32+OpenGL3: Replace legacy 'GL/GL.h' with 'GL/gl.h' ( #8861 )
2025-08-06 10:43:57 +09:00
ocornut
6af6cec23f
Merge branch 'master_fonts' into docking
...
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# 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_sdl3.cpp
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_sdlgpu3.h
# backends/imgui_impl_vulkan.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl2_directx11/main.cpp
# examples/example_sdl2_opengl2/main.cpp
# examples/example_sdl2_opengl3/main.cpp
# examples/example_sdl2_vulkan/main.cpp
# examples/example_sdl3_opengl3/main.cpp
# examples/example_sdl3_sdlgpu3/main.cpp
# examples/example_sdl3_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2025-06-11 18:07:19 +02:00
ocornut
c18301f356
Examples: remove explicit font sizes from AddFontXXX() calls. Add commented out style.FontSizeBase assignment.
2025-06-11 16:25:03 +02:00
ocornut
d72e66cdee
Examples: remove comments/references about baking and GetGlyphRangesJapanese().
2025-06-11 16:11:03 +02:00
ocornut
09654f4e8c
Revert "Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10."
...
This reverts commit 6da230636b
2025-03-11 18:42:12 +01:00
ocornut
6da230636b
Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10.
2025-03-11 12:25:19 +01:00
ocornut
8679cfa2d8
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
# imgui.cpp
2025-02-07 18:27:32 +01:00
fdsa
4f1d3809c3
Fixed tabs and spaces ( #8377 )
2025-02-06 19:54:43 +01: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
d8c98c8c14
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
2024-08-01 19:07:53 +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
96b5b1724b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
2023-12-05 12:20:16 +01:00
ocornut
c6ec69c7c1
Using nullptr in remaining examples/backends locations. ( #6313 , #7071 , #4537 )
2023-11-28 19:29:17 +01: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
1450d23b60
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2023-06-20 15:12:09 +02:00
ocornut
3cc9d2051a
Examples: Win32+OpenGL3: Fixed not calling DefWindowProcW() as with other Win32 examples. ( #6516 , #5725 , #5961 , #5975 )
...
Amend fe0a24f
2023-06-13 11:24:09 +02:00
ocornut
530134d125
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
2023-05-10 12:57:37 +02:00
ocornut
513af1efc9
Examples: Updated all Visual Studio project file to use /utf-8 option, so string literals are UTF-8 encoded by default.
...
(Not to misake with "Character Set" "Use Unicode Character Set" "Use Multi-Byte Character Set" which is a VS/Windows SDK thing but not a compiler-encoding thing.)
2023-05-10 12:34:11 +02:00
ocornut
f498f084d6
Examples: Amend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:48:07 +02:00
Mark Jansen
4bc51c6ff4
Examples: Extend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:46:54 +02:00
ocornut
9308cfdcfb
Examples: Amend Win32/Winapi + OpenGL example. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:28:15 +02:00
Mark Jansen
a566ecc58f
Examples: Add Win32/Winapi + OpenGL example. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
...
Removed mulit-viewpot stuff in this commit on master, will be re-added separately.
2023-04-19 16:22:53 +02:00
