Omar
|
bb1e6f8af6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2020-02-17 18:33:59 +01:00 |
|
Rokas Kupstys
|
21b9e42964
|
Minor fixes to example_sdl_metal and a changelog entry.
Add example_sdl_metal to CI builds.
Closes #3017.
|
2020-02-10 16:53:37 +01:00 |
|
omar
|
e7bfcb970e
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2020-01-30 15:21:16 +01:00 |
|
omar
|
0a23582718
|
Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.
|
2020-01-29 20:11:42 +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
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
2019-11-25 18:29:28 +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
|
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 |
|
Rokas Kupstys
|
6892b81578
|
Remove trailing spaces from bunch of files.
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
|
2019-10-15 16:04:02 +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
|
adbbd17cb6
|
Addendum to #2635. Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. (#1542)
|
2019-06-18 23:37:57 +02:00 |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
2019-06-18 11:28:26 +02:00 |
|
Vincent Hamm
|
cc4d76cc23
|
Implement SDL/dx11 sample
|
2019-06-18 11:05:29 +02:00 |
|