mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,934 Commits 9 Branches 125 Tags 187 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
omar b8ade0b94f Examples: Main: Removed call to SetNextWindowSize() 2017-09-01 17:07:19 +02:00
omar d9016964ad Examples: GL3: Comments, tweaks (#1145) 2017-09-01 16:55:04 +02:00
omar c47e5fc76a Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master 2017-09-01 16:49:36 +02:00
unknown cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798 2017-09-01 20:39:12 +12: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 b4fe5d36a4 Examples: OpenGL3+SDL: Fix types to uses GlEnum (#1147) 2017-08-12 00:46:58 +08:00
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS 2017-08-11 13:36:28 +08:00
omar f3cf5e0322 Examples: SDL+GL3: Fixed old comments (#1229) 2017-07-15 17:50:01 +08:00
omar 52df0032a5 Travis: Blind fix for SDL+GL3 project on the Travis build setup. 
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229, #1209)
 2017-07-15 13:19:13 +08:00
omar 358e667b7a Travis: Adding the SDL+GL3 project on the Travis build setup (for both Linux and OSX). 
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229, #1209)
 2017-07-15 13:13:09 +08:00
omar 0fe5728971 Examples: SDL+GL3: Makefile fix for Linux (#1229, #1209) 2017-07-15 13:07:43 +08:00
radius 8b6896faf9 add SDL GL3 makefile 2017-07-02 21:38:27 -05:00
Nicolas Guillemot ad3c1e68ab save and restore sampler in GL 3 examples 2017-05-16 16:43:59 -07:00
omar c3d9e0a6eb Examples: SDL2: Tweaked batch files for Win32. 2017-05-01 15:00:42 +02:00
omar b3d237a5ce Examples: SDL2: Added build .bat files for win32. 2017-05-01 13:47:59 +02:00
omar 9fdd66330f Examples: SDL2+GL3: Fix blend func state save/restore (#1120) 2017-05-01 12:20:51 +02:00
omar 50b4b29beb Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 (#1087, #1088, #1116) 2017-04-26 18:16:59 +02:00
ocornut a68ac96bc4 Examples: GL3: Comments about gl3w (#880) 2016-11-12 12:48:33 +01:00
ocornut 0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. (#875) 2016-10-15 11:36:43 +02:00
ocornut b96471143f Merge branch 'master' of https://github.com/madeso/imgui into madeso-master 2016-10-01 14:56:24 +02:00
ocornut bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807) 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 (#810) 2016-09-03 19:24:57 +02:00
Gustav 08a9e78da5 fixed space issues 2016-08-29 23:35:56 +02:00
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame 2016-08-27 00:32:20 +02:00
Jamie Seward 0a1d456de1 Fix compile warnings in SDL examples 2016-07-30 15:26:49 -07:00
ocornut d8dacd729b Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it (#752) 2016-07-29 10:10:41 +02:00
ocornut c1da3e354e Examples: SDL: Fixed unused variable warning on non-Windows platforms (#626) 2016-05-04 23:20:41 +02:00
ocornut bfb2dc2290 Examples: OpenGL3: Saving/restoring glActiveTexture() state (#602) 2016-04-30 19:02:19 +02:00
ocornut 1612ca071b Examples: SDL: Initialize video+timer subsystem only. 2016-04-13 00:15:58 +02:00
ocornut a6399f120f IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) (#473) 
NB: Value not used.
 2016-04-02 18:22:40 +02:00
ocornut 7661b1e778 Trim trailing spaces 2016-03-26 15:43:45 +01:00
ocornut fdc4299c6c Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one 2016-03-25 22:27:43 +01:00
ocornut e6c2c1fcfd Examples: SDL: Minor fixes to follow syntax of other examples (#495) 2016-03-25 22:25:20 +01:00
Nick Gravelyn 8a61c0afea Applying same fix to OpenGL 3 example. Fixing spaces/tabs. 2016-03-25 22:20:57 +01:00
ocornut 04396ed7a9 FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...) 2016-03-24 11:00:47 +01:00
ocornut 1dcb9c877d Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (#486, #547) 2016-03-06 10:46:57 +01:00
ocornut 2813a44dcc Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer (#486) 2016-02-16 09:14:38 +01:00
ocornut 9e86d0e225 Examples: SDL/OpenGL: Tabs to spaces 2016-02-15 10:56:37 +01:00
ocornut 87a6110994 Examples: OpenGL3: Fix BindVertexArray/BindBuffer order (#527) 2016-02-15 10:55:20 +01:00
ocornut 49fb7364b5 Examples: SDL2+OpenGL3: Fix context creation options (#468, #463) 2016-01-05 10:23:43 +01:00
ocornut 3aa4a108ed Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX (#463) 2015-12-30 11:27:39 +01:00
ocornut 217a6c875a Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens (#441) 
Fix for 980ca286fe
 2015-12-19 20:54:23 +01:00
ocornut 6cee2fca94 Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples. 
+ Standardized comments.
 2015-11-29 14:54:05 +00:00
ocornut 94ec3d534e Examples: Header comments. 2015-11-29 11:25:15 +00:00
ocornut 6800939e73 Examples: Header comments. 2015-11-29 11:19:30 +00:00
ocornut 5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments. 2015-11-29 11:11:03 +00:00
zryan3 aa6cb32bd4 fixed text referencing GLFW library in SDL examples 2015-11-27 23:04:35 -07:00
ocornut 38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line (#411) 2015-11-22 17:09:03 +01:00
ocornut 899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme (#356) 2015-11-16 22:13:06 +01:00
ocornut ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example (#356) 2015-11-16 22:12:18 +01:00