omar
|
fff014dfed
|
Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.)
|
6 years ago |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
6201cad2b4
|
Examples: Comments, Demo: Log early out, TODO. (#1553)
|
6 years ago |
|
omar
|
c38fe6b0e1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
20e89201cb
|
Examples: Fixes.
|
6 years ago |
|
omar
|
24aeca3d0c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
cdf51cad2d
|
Comments, documentation
|
6 years ago |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
6 years ago |