Commit Graph
100 Commits
Author SHA1 Message Date
omarandGitHub 633f60cdb2 Update README.md 2017-10-15 21:30:06 +02:00
omarandGitHub bebc49bc2a Merge pull request #1368 from ripieces/rendering-issue-1172
ImDrawList: Merging issue fix.
2017-10-15 21:07:05 +02:00
omarandGitHub 251bc6c22c Update README.md 2017-10-13 21:29:31 +02:00
omarandGitHub b498856c9d Update README.md 2017-10-13 20:05:50 +02:00
omarandGitHub dbab9b248a Update README.md 2017-10-13 20:03:56 +02:00
omarandGitHub ae1a6dc075 Merge pull request #1352 from matiTechno/master
Comments: Fixed typo
2017-10-04 20:39:14 +02:00
omarandGitHub 2ca1884a39 Merge pull request #1350 from benvanik/patch-2
Fix binary_to_compressed_c tool to return 0 when successful.
2017-10-03 20:52:30 +02:00
omarandGitHub c0cf123e0b Update README.md 2017-09-28 20:39:36 +02:00
omarandGitHub 24f21bd4d4 Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
2017-09-25 22:13:38 +02:00
omarandGitHub 9b2672a99f Update README.md 2017-09-19 18:33:04 +02:00
omarandGitHub 2fc07c1b7d Update README.md 2017-09-19 18:32:09 +02:00
omarandGitHub ba12d37719 Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
FIxes zealous Clang warning.
2017-09-19 18:18:53 +02:00
omarandGitHub 2aa9a538c0 Merge pull request #1323 from waywardmonkeys/remove-commas-at-end-of-list
Remove commas after last item in enumeration to stay compatible with older compilers.
2017-09-15 11:52:14 +02:00
omarandGitHub 83645aa593 More consistently uses "Dear ImGui" 2017-09-15 01:28:30 +02:00
omarandGitHub 3420080a35 Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut
Simplify alloca.h include condition (fix for NetBSD)
2017-09-11 11:00:23 +02:00
omarandGitHub 8971d70149 Merge pull request #1313 from thevaber/master
Improved ColorPicker hue wheel color interpolation
2017-09-05 18:35:08 +02:00
omarandGitHub d165817880 Merge pull request #1307 from JJscott/dev
Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
2017-09-01 22:30:14 +08:00
omarandGitHub 0d4b08a851 Added Go binding link 2017-08-28 12:14:29 +08:00
omarandGitHub 34d09f2dc8 Merge pull request #1283 from onqtam/imgui_api
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
2017-08-16 23:29:52 +08:00
omarandGitHub f827c8448a Merge pull request #1282 from jadwallis/master
ImFontAtlas: Make font atlas padding between packed glyphs configurable
2017-08-16 10:45:07 +08:00
omarandGitHub d2c219df84 Merge pull request #826 from swetland/patch
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
2017-08-14 16:50:20 +08:00
omarandGitHub 41076188ca Merge pull request #1277 from luk1337/master
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
2017-08-12 12:53:13 +08:00
omarandGitHub 0f126a5b07 Update README.md (small wording bits, inspired by #1093) 2017-08-12 01:05:24 +08:00
omarandGitHub 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
omarandGitHub 6e04cedd5f Updated link to binaries 2017-07-25 20:06:18 +08:00
omarandGitHub 1094afc6be Merge pull request #1209 from fr500/master
Examples: Fix Makefile for non-6.3 MINGW versions, added SDL+GL3 Makefile.
2017-07-09 17:29:57 +02:00
omarandGitHub 1cd1ca259e Update README.md 2017-06-02 14:01:06 +02:00
omarandGitHub 32f5ef4f98 Added Pascal binding 2017-06-01 12:25:01 +02:00
omarandGitHub 475446b8b9 Merge pull request #1080 from SaschaWillems/master
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
2017-05-01 14:50:34 +02:00
omarandGitHub a606f2dcb5 Update README.md 2017-04-28 13:43:11 +02:00
omarandGitHub 9ab9a846a1 Update README.md 2017-04-28 13:40:50 +02:00
omarandGitHub 6e69923e35 Update README.md 2017-04-28 13:32:04 +02:00
omarandGitHub 32390a252f Added UnrealEngine_ImGui link 2017-04-28 10:28:52 +02:00
omarandGitHub 15d7f20d4f Update README.md 2017-04-01 18:44:34 +02:00
omarandGitHub 4b125e7d5c Merge pull request #1078 from nem0/master
Added missing IMGUI_API macros in ImGuiTextEditCallbackData methods.
2017-03-29 14:51:26 +02:00
omarandGitHub 9a068ce005 Merge pull request #1068 from codecat/fix-colorbutton
ColorButton: fix showing wrong hex value for alpha in tooltip.
2017-03-16 09:51:04 +01:00
omarandGitHub 4653197ca4 Update README, kinder 2017-01-28 23:26:25 +01:00
omarandGitHub a7cf369e71 Update README.md 2017-01-28 23:14:35 +01:00
omarandGitHub f4f0ee750f Update README.md 2016-12-21 21:13:43 +01:00
omarandGitHub 081aec482b Merge pull request #931 from nlguillemot/master
Combo, ListBox: Extra const correctness.
2016-12-21 20:06:04 +01:00
omarandGitHub 89d033aba3 Merge pull request #898 from tinnnysu/master
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
2016-11-12 11:08:51 +01:00
omarandGitHub 43e6c46c8d Merge pull request #877 from Velro/patch-1
Demo: Outdated dragging API mentioned in demo text
2016-10-16 18:32:13 +02:00
omarandGitHub 7995cabce5 Merge pull request #864 from jslee02/fix-clang-unknown-warning
Fix clang warning for old Clang versions: unknown warning group '-Wreserved-id-macro'
2016-10-06 21:48:00 +02:00
omarandGitHub 18d36e6f63 Merge pull request #837 from fdb/patch-1
Update link to Synergy repo.
2016-09-21 21:18:56 +02:00
omarandGitHub 012223114d Merge pull request #825 from philix/fix-build
Examples: OSX: Fix Mac OS X build XCode project and remove cruft from Makefile
2016-09-10 11:31:41 +02:00
omarandGitHub 500d19bfdf Update README.md 2016-09-08 09:12:17 +02:00
omarandGitHub b594b25be8 Update README.md 2016-09-08 09:11:29 +02:00
omarandGitHub 3a699e7264 Update README.md 2016-09-05 13:40:04 +02:00
omarandGitHub 056e49eec1 Merge pull request #812 from linkemars/master
Examples: opengl3 glfw: Mac makefile - correct name for linking opengl3_example
2016-09-02 15:00:49 +02:00
omarandGitHub 9af74181ce Merge pull request #804 from Loftilus/master
Examples: Vulkan: Fix Vulkan example for use when a depth buffer is active.
2016-09-01 09:23:46 +02:00
omarandGitHub b36ba12929 Travis test fix 2016-08-25 16:20:34 +02:00
omarandGitHub 622715725d Merge pull request #783 from bear24rw/patch-1
Demo: Add null terminator to ShowStyleEditor() output_type combo options
2016-08-19 18:00:27 +02:00
omarandGitHub 9ab20e6c9c Merge pull request #756 from jseward/master
Examples: SDL: Fix compile warnings.
2016-07-31 09:28:21 +02:00
omarandGitHub cabba0f158 Update README.md 2016-07-29 18:52:38 +02:00
omar 681d5624f7 Merge pull request #666 from jslee02/patch-1
Fix minor typo in examples/README.txt
2016-05-20 13:24:41 +02:00
omar 10d3da6b73 Merge pull request #641 from cosmy1/errors-fix
Fix compilation errors when disabling test windows.
2016-05-12 13:41:05 +02:00
omar 8af76d56b4 Merge pull request #639 from sergof/conversion-warnings
Ignore various anal GCC warnings.
2016-05-07 21:08:43 +02:00
omar 1b9894cfb4 Merge pull request #624 from develophant/master
Fix typo in Programmer guide
2016-05-02 09:48:54 +02:00
omar fec7dc22a9 Update README.md - binaries 2016-04-18 16:33:49 +02:00
omar ce61367520 Update README.md - binaries 2016-04-18 16:33:04 +02:00
omar af46ca2b4c Merge pull request #587 from sergof/patch-1
Fix font config propagation in FontFromMemoryCompressedTTF()
2016-04-13 09:52:34 +02:00
omar 319e288eef Update README.md 2016-04-05 23:08:21 +02:00
omar b359ed7b3e Remove local glfw3 lib for osx. (+1 squashed commit)
Examples: Added OS X example (moved from ios, added support for os x)
2016-04-05 22:43:36 +02:00
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