moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,112 Commits 4 Branches 0 Tags
171b0e5ca96fcb9721f4c62bfb607a6a0f51a0ff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
omar 171b0e5ca9 Update README.md 2016-03-30 16:30:17 +02:00
omar 41c5d4651b Update README.md 2016-03-27 12:04:17 +02:00
omar c4876078b4 Update README.md 2016-03-27 11:43:12 +02:00
omar 39c9bb73e8 Merge pull request #563 from mneumann/fix_dragonfly 
Fix compilation on DragonFly BSD
 2016-03-26 16:40:00 +01:00
omar 8e8e59a942 Merge pull request #555 from DMartinek/patch-1 
CheckboxFlags: Added support for passing/testing multiple flags at the same time.
 2016-03-21 13:09:55 -07:00
omar 991d9e2884 Update README.md 2016-02-20 23:20:15 +01:00
omar 874df53403 Update README.md 2016-02-20 20:46:08 +01:00
omar d6be992bef Travis CI: test adding osx 2016-01-21 21:43:24 +00:00
omar 39510d05ea Update README.md 2016-01-17 10:35:21 +00:00
omar 8de3f4843c Update README.md - revert + patrons 2015-12-24 20:19:59 +01:00
omar f631ae26ca Update README.md - dear imgui 2015-12-24 20:06:09 +01:00
omar e34b4b46da Update README.md - dear imgui 2015-12-24 20:00:29 +01:00
omar fe2972e8b2 Merge pull request #420 from RaptorFactor/master 
Examples: DX11: Compile shaders with lower features levels.
 2015-11-30 19:36:06 +00:00
omar c0ec9f4e63 Merge pull request #416 from zryan3/bugfix/sdl2_typos 
Examples:SDL: fixed comment referencing GLFW.
 2015-11-28 09:36:06 +00:00
omar b4556c404d Update README.md 
Removed paragraph.
 2015-11-27 23:43:19 +00:00
omar bfacd250df Update README.md 2015-11-27 23:42:07 +00:00
omar 60b75d78ea Update README.md 2015-11-24 19:13:05 +00:00
omar b959c74488 Update README.md - faq 2015-11-22 23:12:50 +00:00
omar 1e69a86d30 Update README.md 2015-11-20 09:36:43 +01:00
omar 0b47edcefe Merge pull request #403 from JasonWilkins/master 
Fixed a couple of problems found by CppCat code analyzer.
 2015-11-10 23:28:51 +00:00
omar b168c72dd1 Update README.md 2015-11-01 22:53:29 +00:00
omar d963ff13ca Update README.md 2015-11-01 22:25:33 +01:00
omar acc87f7f5e Update README.md 2015-11-01 22:18:37 +01:00
omar d0afb23a3f Merge pull request #389 from dougbinks/master 
Font merge demo and documentation minor additions.
 2015-10-30 10:39:59 +01:00
omar 0b0c460324 Travis CI: revert, giving up update for now. 2015-10-19 20:10:43 +01:00
omar 7245599f04 Travis CI: test upgrading to container-based build (3) 2015-10-19 20:05:02 +01:00
omar d86dd37091 Travis CI: test upgrading to container-based build 2015-10-19 19:59:53 +01:00
omar f11adc1c08 Travis CI: test upgrading to container-based build 2015-10-19 19:57:46 +01:00
omar 42529f1270 Merge pull request #378 from Gargaj/patch-1 
Examples: DirectX9: NULL out font texture on Invalidate so NewFrame() can be called directly without ImGui_ImplDX9_CreateDeviceObjects()
 2015-10-18 18:11:54 +01:00
omar 81927b073e Merge pull request #375 from gzito/master 
Examples: Added example app for the Marmalade platform.
 2015-10-15 11:32:13 +01:00
omar 59cedca02e Merge pull request #371 from nguillemot/master 
Examples: DirectX11: Fix vertex POSITION format (ImDrawVert::pos is 2D, not 4D)
 2015-10-12 09:26:49 +01:00
omar b93e787f51 Merge pull request #369 from richardkogelnig/master 
InputText: Fix for not being able to enter certain characters in InputText on german keyboard
 2015-10-11 17:16:10 +02:00
omar 379079ac42 Merge pull request #361 from fr500/master 
Examples: OpenGL3: Add msys2/mingw64 target.
 2015-10-08 20:47:22 +02:00
omar 0298603040 Update README.md 
More begging, still in search for a solution..
 2015-10-08 15:35:39 +02:00
omar 69678d1ed2 Merge pull request #357 from orthographic-pedant/spell_check/accommodate 
Fixed typographical error, changed "accomodate" to "accommodate" in README.
 2015-10-03 19:13:04 +02:00
omar 9d89e03346 Merge pull request #348 from zho7611/add_korean_support 
ImFontAtlas: Added GetGlyphRangesKorean() for Korean.
 2015-09-23 18:49:11 +02:00
omar 994c286f61 Merge pull request #342 from nem0/master 
PlotHistogram: Fixed rendering of histogram with a lot of values.
 2015-09-20 11:26:13 +02:00
omar 774099918a Update README.md 2015-09-19 15:37:28 +02:00
omar c31ca3e2d5 Update README.md - demo binaries 2015-09-09 14:28:09 +01:00
omar 13daaf78a2 Update README.md 2015-08-30 19:41:02 +01:00
omar 55ea2988d2 Update README.md 2015-08-28 00:04:49 +01:00
omar 7eca754094 Merge pull request #304 from yinjimmy/fix_ios 
Examples: Fixed missing files in iOS example.
 2015-08-23 11:05:39 +02:00
omar e885b08914 Web: Fixed screenshot (Argh web editor is broken) 2015-08-22 11:54:47 +02:00
omar 0e898fb480 Web: Fixed screenshot 2015-08-22 11:54:13 +02:00
omar 5f4cbed7ce Web: Fixed screenshot 2015-08-22 11:53:45 +02:00
omar 06c7453ee2 Merge pull request #302 from andresv/mac-sdl2-example-build-instructions 
Examples: SDL: Add Mac OS X build instructions for sdl_opengl_example
 2015-08-20 22:21:01 +01:00
omar 9a97ef673e Merge pull request #296 from tpoechtrager/master 
Fixes for compiling Windows target with non-MSVC compiler.
 2015-08-09 10:49:06 -06:00
omar b6313577bb Merge pull request #291 from twoscomplement/surplus_inlines 
Remove inline qualifiers inside .cpp
 2015-08-06 07:33:12 -06:00
omar 80fc576d07 Update README.md 2015-08-05 22:17:10 -06:00
omar a526b423e8 Merge pull request #290 from cmaughan/master 
Examples: DirectX11: Clear font texture view pointer to ensure Release() doesn't get called twice
 2015-08-04 07:48:31 -06:00
omar 040e427dad Merge pull request #289 from twoscomplement/sdl_error_out 
Examples: Show SDL error message on init failure.
 2015-08-01 17:07:05 -06:00
omar fc9ee2bc9b Merge pull request #286 from GHF/cleanup 
Remove non-text character at start of imgui.cpp
 2015-07-30 12:14:01 -06:00
omar 98047b1b65 Update README.txt 2015-07-16 14:28:16 -06:00
omar f53d5da0f8 Update README.txt 2015-07-16 14:27:35 -06:00
omar bc4ede656b Merge pull request #274 from DanielGibson/utf8-char-input 
ImGuiIO::AddInputCharactersUTF8(utf8str), use it in SDL2 example
 2015-07-15 22:08:59 -06:00
omar b4ac413868 Merge pull request #273 from DanielGibson/fix-sdl2-linux 
Examples: Fix SDL2 example for Linux.
 2015-07-15 20:15:33 -06:00
omar 52dd99915b Update README.md 2015-07-15 17:05:14 -06:00
omar 9d4d7f3381 Update README.md 2015-07-15 17:00:47 -06:00
omar 298118fccc New screenshots 2015-07-15 16:58:38 -06:00
omar 7d45c84f21 Merge pull request #266 from Extrawurst/patch-4 
Fix minor clang-x64 warnings (fixes #265)
 2015-07-08 17:02:28 -06:00
omar d81ba432ec New demo binaries 2015-07-08 13:22:34 -06:00
omar 12aba576fb Merge pull request #264 from joeld42/antialias-ios-fix 
AA branch: iOS Example: update for API changes and index rendering
 2015-07-08 10:29:39 -06:00
omar a33810d652 Update README.md 2015-07-03 16:08:00 -06:00
omar 5d59e965f6 Update README.md 2015-07-02 15:42:19 -06:00
omar 7bd28d17ca Update README.md 2015-07-02 15:35:55 -06:00
omar 14f189b2f6 Merge pull request #250 from benvanik/patch-1 
Fixing 64-bit compilation warning caused by implicit size_t->int cast
 2015-06-26 20:23:32 -06:00
omar e57d460e31 Update README.md 2015-06-03 12:48:55 +01:00
omar b148f70f83 Update README.md - new demo binaries 2015-05-31 14:51:35 +01:00
omar abd0e85fc6 Update README.md - supporters 2015-05-29 15:42:15 +01:00
omar 46a27cdb6b Merge pull request #236 from bkaradzic/master 
Define STBTT_DEF extern when STBTT not compiled with ImGui.
 2015-05-28 08:19:14 +01:00
omar 30a0193d73 Merge pull request #229 from gordonmcshane/osx-example-fix 
Examples: OpenGL3: Fix for OSX requiring forward compatibility flag (see #229)
 2015-05-19 10:36:23 +01:00
omar 33a2fd368a Merge pull request #218 from paperManu/inputNFlags 
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
 2015-05-11 16:54:12 +01:00
omar cd2ec7868c Merge pull request #217 from Pagghiu/bugfix 
Example fix PopStyleVar on Vertical Slider to avoid assertion
 2015-05-11 14:12:23 +01:00
omar 8ac9036db3 Merge pull request #214 from ghassanpl/upstream 
InputText(): make sure letter-key shortcuts have ONLY the control key pressed
 2015-05-11 09:26:00 +01:00
omar 6408ac482c Merge pull request #199 from bkaradzic/master 
Fixed C4267 size_t to unsigned int conversion warning.
 2015-04-17 08:09:07 +01:00
omar 17b63d846f Merge pull request #194 from Roflraging/master 
Examples: GLFW Set modifier key state by inspecting imgui's io.KeysDown array (see #183)
 2015-04-14 20:33:12 +01:00
omar 88bc8efab0 Merge pull request #193 from Extrawurst/patch-3 
Fix outdated documentation
 2015-04-14 00:22:32 +01:00
omar ae1166a783 Merge pull request #191 from Extrawurst/patch-2 
Fixed unused variable warning.
 2015-04-09 15:59:43 +01:00
omar 71cfa264d7 Merge pull request #188 from Extrawurst/patch-1 
Fix initialising ints with float literals
 2015-04-08 22:58:34 +01:00
omar b9dd7c65ab Update README.md 2015-04-07 20:09:59 +01:00
omar 7c9739c67f Merge pull request #187 from heroboy/patch-1 
Examples: DirectX9: Set shaders to NULL to enforce using fixed pipeline.
 2015-04-07 12:55:12 +01:00
omar a8a5ba9d1e Update README.txt 2015-04-07 11:15:18 +01:00
omar 46769406dc Update README.txt 2015-04-07 10:59:49 +01:00
omar fc1b0b090c Update README.md 
Coverity badge
 2015-04-01 15:26:36 +01:00
omar 136dbdfd95 Merge pull request #174 from adamdmoss/glfwcursor 
Examples: OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
 2015-03-22 14:10:27 +00:00
omar fde991fbbb Update README.md 2015-03-21 23:56:23 +00:00
omar dec73a8a8a Update README.md - demo binaries 2015-03-21 23:51:57 +00:00
omar 3b3a32cbd6 Merge pull request #168 from mmozeiko/fixassert 
Replace assert() with IM_ASSERT in some functions copied from stb.h
 2015-03-20 08:37:13 +00:00
omar c151f35751 Merge pull request #166 from jsimmons/master 
Remove spurious assert
 2015-03-19 11:46:31 +00:00
omar 9a6aebeb96 Merge pull request #163 from biller23/patch-1 
Examples: typo in ImGui_ImplGlFwGL3_KeyCallback() forward-declaration.
 2015-03-18 20:26:03 +00:00
omar 4e245f0bfb Update README.md 
Link to Synergy sources
 2015-03-18 14:06:39 +00:00
omar 6f150d8800 Merge pull request #161 from adamdmoss/boxmax 
GetItemBoxMax: fix obsolete function copy-n-paste bug
 2015-03-18 11:30:32 +00:00
omar d4c0ecea0e Merge pull request #159 from adamdmoss/master 
Examples: OpenGL: if content window doesn't have focus, tell ImGui we don't have a mouse position.
 2015-03-16 11:46:29 +00:00
ocornut 6e12d31417 Scrollbar: moved from Begin() into its own Scrollbar() function + tidying up 2015-03-08 16:37:03 +00:00
ocornut f021080851 Scrollbar: Clicking inside the grab box doesn't modify scroll. Subsequent movement always relative. (#150). 
Big change, rather thoroughly tested but hope I didn't break something.
 2015-03-08 16:24:11 +00:00
ocornut 32312e538e Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing. 2015-03-08 15:03:55 +00:00
ocornut afc23a5617 Tidying up & Chinese glyph range includes missing punctuation. 2015-03-08 13:28:44 +00:00
ocornut 79ddddd910 Merge branch 'master' of https://github.com/ocornut/imgui 2015-03-08 13:26:14 +00:00
omar 830d9f4183 Merge pull request #157 from usagi/master 
Fix the Japanese glyph range; include Punctuations
 2015-03-08 13:26:02 +00:00
ocornut a579d6f521 Scrollbar tidying up variable names 2015-03-08 12:39:50 +00:00