omar
|
f5528001f6
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# imgui.cpp
# imgui_internal.h
|
5 years ago |
Konstantin Podsvirov
|
b887259974
|
Bindings: Improved FreeGLUT support for MinGW (#3004)
|
5 years ago |
|
omar
|
3fe6ae9732
|
Internals: Move some Nav functions and members around (no functional change) + Misc comments
|
5 years ago |
|
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
|
5 years ago |
|
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
5 years ago |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
5 years ago |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
5 years ago |
|
omar
|
d3d998a885
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
5 years ago |
|
omar
|
2da1c66d15
|
Version 1.71 + comments
|
5 years ago |
|
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
5 years ago |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
6 years ago |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
cdb109f617
|
Renamed freeglut vcxproj files + Comments, Changelog (#2465)
|
6 years ago |
Andrew Willmott
|
ece322ff12
|
freeglut -> glut rename
|
6 years ago |