Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 17:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,204 Commits 13 Branches 79 Tags 86 MiB
4170b4847d
Commit Graph

2204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ocornut
7552f48d7b ImLoadFileToMemory() default parameters 2015-07-21 17:46:49 -06:00
ocornut
94f085aa3e Update comments (#219) 2015-07-21 17:19:11 -06:00
ocornut
5a29eef1fa Fixed further warnings with GCC/Clang (#219) 2015-07-21 17:13:56 -06:00
ocornut
e32f0931e8 Missing includes for imgui_draw.cpp (#219) 2015-07-21 17:08:20 -06:00
ocornut
52a74701f5 Updated projects to reference new files (#219) 
Didn't update iOS example (#247)
 2015-07-21 17:04:03 -06:00
ocornut
dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 2015-07-21 17:00:28 -06:00
ocornut
60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. (#219) 2015-07-19 11:45:03 -06:00
ocornut
0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278) 2015-07-19 10:52:51 -06:00
ocornut
dc1cb9e625 Tweak 2015-07-19 10:49:56 -06:00
ocornut
d184730dd2 Merge branch 'trevex-master' 2015-07-19 10:45:59 -06:00
Nik Voss
bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ocornut/imgui#277). 2015-07-19 17:56:14 +02:00
ocornut
83ebbebadd Fixed inconsistent declaration of ImVec2 privates operators 2015-07-18 22:37:08 -06:00
ocornut
5a4b521855 Added ImDrawList::AddText() shorthand helper 2015-07-18 21:50:23 -06:00
ocornut
74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason 2015-07-18 18:45:37 -06:00
ocornut
479211808f ImDrawList::AddPolyLine() tidying up in AA path 2015-07-18 17:31:40 -06:00
ocornut
82727d7119 Version number 1.44 WIP 2015-07-18 14:07:22 -06:00
ocornut
cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window 
Would be more useful with finer control over display layer
 2015-07-17 16:36:04 -06:00