You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
omar 56ad2a2d74 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/vulkan_example/main.cpp
#	imgui.h
7 years ago
..
CMakeLists.txt Fixing minor english typos (#827) 8 years ago
build_win32.bat Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants. 7 years ago
build_win64.bat Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants. 7 years ago
gen_spv.sh Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x) 8 years ago
glsl_shader.frag Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x) 8 years ago
glsl_shader.vert Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex. 8 years ago
main.cpp Merge branch 'master' into viewport 7 years ago
vulkan_example.vcxproj Examples: Using draw_data->DisplaySize, followup to c50198debe. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. (#1542, #1042) 7 years ago
vulkan_example.vcxproj.filters Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files. 7 years ago