807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-26 18:43:10 +08:00
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
9bf5028fd3
Merge branch 'master' into navigation
2017-08-15 00:50:59 +08:00
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
2017-08-12 00:46:58 +08:00
048322f3fd
Merge pull request #1147 from TinyTinni/master
...
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147 )
2017-08-12 00:43:34 +08:00
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-08-11 13:44:25 +08:00
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
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2017-08-07 22:51:18 +08:00
645875a240
Examples: Enable vsync by default in example applications ( #1213 , #1151 )
2017-07-23 16:13:17 +08:00
8b6896faf9
add SDL GL3 makefile
2017-07-02 21:38:27 -05:00
e0aac34672
fix compilation on MINGW
2017-07-02 11:21:24 -05:00
3a7111cfcd
casting to GLint on init
2017-05-17 21:42:34 +02:00
0981d8e381
fixes types
2017-05-16 12:49:47 +02:00
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
fdc70456f4
Merge branch 'master' into 2016-07-navigation
2016-12-23 12:13:52 +01:00
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
2016-12-21 20:12:43 +01:00
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-11-27 18:25:20 +01:00
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01:00
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
2016-10-16 14:01:13 +02:00
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-10-07 09:52:14 +02:00
2919c77bee
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ( #800 )
2016-10-01 14:59:28 +02:00
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 12:59:24 +02:00
02399852fe
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ( #824 )
2016-09-10 17:43:17 +02:00
6e6f04f513
Fix Mac OS X build and remove cruft from Makefile
2016-09-10 11:22:40 +02:00
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
2016-09-05 23:39:52 +02:00
031d4e689d
Examples: OpenGL3: Revert Makefile change for OSX for now ( #812 )
2016-09-05 22:52:45 +02:00
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
aa0cb13aa4
Correct name for linking opengl3_example
...
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.
Changed this made the compilation on my Mac successfully.
2016-09-02 21:57:31 +09:00
79e7ece259
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
2016-07-30 23:17:11 +02:00
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
2016-04-30 19:02:19 +02:00
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
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +01:00
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
2016-03-06 10:46:57 +01:00
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
2016-02-16 09:14:38 +01:00
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
2016-02-15 10:55:20 +01:00
b8f86ec4bd
Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
2016-01-21 22:30:47 +00:00
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
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
94ec3d534e
Examples: Header comments.
2015-11-29 11:25:15 +00:00
6800939e73
Examples: Header comments.
2015-11-29 11:19:30 +00:00
5c52e9ec0d
Examples: Clarified comments. Removed font merging example from comments.
2015-11-29 11:11:03 +00:00
d673db3092
Examples: Added README into the Visual Studio solution to people are less likely to miss it.
2015-11-29 11:01:50 +00:00
624adb1b23
Tweak build batch files and readmes
2015-11-16 22:03:13 +01:00
f87deff0f3
Moving stdlib.h include outside of imgui.h ( #405 )
2015-11-13 17:08:54 +01:00
3b2fdf27a8
Examples: Added /Zi (output debug information) in build_win32.bat files
2015-11-11 09:45:18 +00:00
1d76890526
Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
2015-11-08 22:52:25 +00:00
