omar
|
5c4fda0fbc
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
4abce8af58
|
Examples: GL2: Renaming, comments.
|
7 years ago |
|
omar
|
7d1f2c0dc5
|
Examples: GL2: rename functions to include GL2 in name
|
7 years ago |
unknown
|
cf48e28932
|
Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
|
7 years ago |
|
omar
|
807322c9a5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
92a6faca6f
|
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
|
7 years ago |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
7 years ago |
|
omar
|
166e8f6261
|
Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility (#1116)
|
7 years ago |
|
omar
|
27b83a2cac
|
Merge branch 'master' into 2016-07-navigation
|
8 years ago |
|
omar
|
f030087f8e
|
Comments to redirect people to OpenGL3 examples (#1116)
|
8 years ago |
|
ocornut
|
3028ccc25b
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
8 years ago |
|
ocornut
|
775ac24d45
|
Fixed overzealous GCC warnings (#883) + partly undo 8553bab241
|
8 years ago |
|
ocornut
|
81eefb704b
|
Minor const fixes for overzealous warnings (#883)
|
8 years ago |
|
ocornut
|
bdb34d1c11
|
Merge branch 'master' into 2016-07-navigation
|
8 years ago |
|
ocornut
|
0d3f8807c7
|
Added a void* user_data parameter to Clipboard function handlers. (#875)
|
8 years ago |
|
ocornut
|
ed279c0095
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
8 years ago |
|
ocornut
|
02399852fe
|
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners (#824)
|
8 years ago |
|
ocornut
|
bc57fd5d1d
|
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807)
|
8 years ago |
|
ocornut
|
2825eaa0be
|
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback (#810)
|
8 years ago |
|
ocornut
|
3c384c2f10
|
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
|
8 years ago |