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
|
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 |
|