Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-16 01:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,371 Commits 13 Branches 79 Tags 86 MiB
63d47bc5a4
Commit Graph

2371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut
a793ad682d Merge branch 'master' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-05 15:29:38 -06:00
ocornut
ebd25cf1a3 Minor comments 2015-08-05 15:13:13 -06:00
ocornut
7fea3eacfe Minor comments 2015-08-05 12:50:13 -06:00
ocornut
e20b90154c Comments 2015-08-05 11:04:13 -06:00
ocornut
3ee2fac892 Slider: fixed using FramePadding between frame and grab visual. Scaling that spacing would look odd. 2015-08-05 11:00:00 -06:00
ocornut
e42bec5ba2 Fixed scaling of checkbox and radio button for the filling of "active" visual 2015-08-05 10:50:20 -06:00
ocornut
155873a6b0 Added GetContentRegionAvail() helper 2015-08-05 10:43:12 -06:00
ocornut
1b0a8f9ac3 Comments 2015-08-05 10:00:05 -06:00
ocornut
60b46cc712 Comment (#219) 2015-08-05 09:34:07 -06:00
ocornut
8be4d41540 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-05 09:32:29 -06:00
ocornut
1befd21b37 Moved ShowUserGuide() after ShowTestWindow() (#219) 2015-08-05 09:31:03 -06:00
ocornut
3658314638 imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built (#219) 2015-08-05 09:28:19 -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
Chris Maughan
d667de9490 Clear font texture view to ensure Release() doesn't get called twice 2015-08-04 14:22:05 +01:00
ocornut
815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-03 08:12:57 -06:00
ocornut
3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF() 2015-08-03 08:10:10 -06:00
ocornut
da3baebd43 Fixed lower-right resize grip hit box not scaling along with its rendered size (#287) 2015-08-02 09:15:36 -06:00
ocornut
e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-01 22:12:51 -06:00
ocornut
3ccbdc8423 Unnecessary .gitignore in root folder 2015-08-01 22:12:18 -06:00
ocornut
4b29cc9e10 Exposed relevant functions in imgui_internal.h (#219) 2015-08-01 21:57:24 -06:00
ocornut
e47bf041bf Clang warning fixes 2015-08-01 21:37:32 -06:00
ocornut
11d91a27a4 Carriage return (#289) 2015-08-01 17:18:01 -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
Jonathan Adamczewski
f158617551 Show SDL error message on init failure 2015-08-02 01:35:43 -07:00
ocornut
1e76c63bb6 Fixed comment 2015-08-01 08:07:16 -06:00
ocornut
2d8c134747 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-01 07:26:09 -06:00
ocornut
26a992c6f6 Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix #280) 2015-08-01 07:22:52 -06:00
ocornut
6c63d80aa4 Tidying up InputTextApplyArithmeticOp() 2015-07-30 23:59:51 -06:00
ocornut
f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up 2015-07-30 23:48:59 -06:00
ocornut
faa609a43c Internal cleanup ParseFormatPrecision() doesn't take a reference 2015-07-30 23:14:29 -06:00
ocornut
f8646338c3 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-07-30 23:00:11 -06:00
ocornut
7650d4cc67 Internal SliderFloatAsInputText() -> InputFloatReplaceWidget() 2015-07-30 22:59:30 -06:00
ocornut
abf823c6f6 Tidying up 2015-07-30 22:49:10 -06:00
ocornut
58ee08f214 Todo list notes 2015-07-30 22:18:07 -06:00
ocornut
040f3950a3 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 21:54:07 -06:00
ocornut
e6b29b70b4 Make internal SliderFloatAsInputText() take a size to match the calling widget 2015-07-30 21:51:55 -06:00
ocornut
a7e5945206 Merge 2015-07-30 21:37:59 -06:00
ocornut
c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 21:37:47 -06:00
ocornut
02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (#133, also ref #288) 2015-07-30 21:11:07 -06:00
ocornut
a79ee94fc4 Removed unnecessary assignment + added comment 2015-07-30 20:59:41 -06:00
ocornut
709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 20:42:12 -06:00
ocornut
527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex) 2015-07-30 19:36:55 -06:00
ocornut
fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set. 2015-07-30 12:32:20 -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
Xo Wang
8d45c89352 Remove non-text character at start of imgui.cpp 2015-07-26 19:18:04 -07:00
ocornut
4468ec001e Fixed warning in console example (we're iterating chars) 2015-07-22 06:38:19 -06:00
ocornut
fb83323b1d Tidying up 2015-07-21 20:13:12 -06:00
ocornut
62c888177a Tweaks 2015-07-21 20:06:34 -06:00
ocornut
e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described (#219) 2015-07-21 19:57:32 -06:00
ocornut
68962ae683 README update 2015-07-21 19:53:06 -06:00