1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-22 23:56:36 +00:00
Commit Graph

20 Commits

Author SHA1 Message Date
omar
5c4fda0fbc Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2017-09-06 19:17:51 +02:00
omar
4abce8af58 Examples: GL2: Renaming, comments. 2017-09-01 17:07:19 +02:00
omar
7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name 2017-09-01 16:45:31 +02:00
unknown
cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes 2017-09-01 20:39:12 +12:00
omar
807322c9a5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
2017-08-26 18:43:10 +08:00
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. 2017-08-25 16:43:25 +08:00
omar
03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation 2017-08-07 22:51:18 +08:00
omar
166e8f6261 Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility () 2017-07-23 15:57:39 +08:00
omar
27b83a2cac Merge branch 'master' into 2016-07-navigation 2017-05-01 12:38:33 +02:00
omar
f030087f8e Comments to redirect people to OpenGL3 examples () 2017-04-26 18:27:10 +02:00
ocornut
3028ccc25b Merge remote-tracking branch 'origin' into 2016-07-navigation 2016-11-27 18:25:20 +01:00
ocornut
775ac24d45 Fixed overzealous GCC warnings () + partly undo 8553bab241 2016-11-12 11:14:37 +01:00
ocornut
81eefb704b Minor const fixes for overzealous warnings () 2016-11-11 18:40:13 +01:00
ocornut
bdb34d1c11 Merge branch 'master' into 2016-07-navigation 2016-10-16 14:01:13 +02:00
ocornut
0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. () 2016-10-15 11:36:43 +02:00
ocornut
ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation 2016-09-25 12:59:24 +02:00
ocornut
02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners () 2016-09-10 17:43:17 +02:00
ocornut
bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness () 2016-09-05 23:39:52 +02:00
ocornut
2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback () 2016-09-03 19:24:57 +02:00
ocornut
3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:18:09 +02:00