Commit Graph

6810 Commits (6f73dbea8017cefbc6e26b894ec3274932ec0c76)
 

Author SHA1 Message Date
ocornut 3658314638 imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built ()
omar a526b423e8 Merge pull request from cmaughan/master
Examples: DirectX11: Clear font texture view pointer to ensure Release() doesn't get called twice
Chris Maughan d667de9490 Clear font texture view to ensure Release() doesn't get called twice
ocornut 815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()
ocornut da3baebd43 Fixed lower-right resize grip hit box not scaling along with its rendered size ()
ocornut e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup
ocornut 3ccbdc8423 Unnecessary .gitignore in root folder
ocornut 4b29cc9e10 Exposed relevant functions in imgui_internal.h ()
ocornut e47bf041bf Clang warning fixes
ocornut 11d91a27a4 Carriage return ()
omar 040e427dad Merge pull request from twoscomplement/sdl_error_out
Examples: Show SDL error message on init failure.
Jonathan Adamczewski f158617551 Show SDL error message on init failure
ocornut 1e76c63bb6 Fixed comment
ocornut 2d8c134747 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 26a992c6f6 Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix )
ocornut 6c63d80aa4 Tidying up InputTextApplyArithmeticOp()
ocornut f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up
ocornut faa609a43c Internal cleanup ParseFormatPrecision() doesn't take a reference
ocornut f8646338c3 Merge remote-tracking branch 'origin' into 2015-07-cleanup
ocornut 7650d4cc67 Internal SliderFloatAsInputText() -> InputFloatReplaceWidget()
ocornut abf823c6f6 Tidying up
ocornut 58ee08f214 Todo list notes
ocornut 040f3950a3 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut e6b29b70b4 Make internal SliderFloatAsInputText() take a size to match the calling widget
ocornut a7e5945206 Merge
ocornut c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (, also ref )
ocornut a79ee94fc4 Removed unnecessary assignment + added comment
ocornut 709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex)
ocornut fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set.
omar fc9ee2bc9b Merge pull request from GHF/cleanup
Remove non-text character at start of imgui.cpp
Xo Wang 8d45c89352 Remove non-text character at start of imgui.cpp
ocornut 4468ec001e Fixed warning in console example (we're iterating chars)
ocornut fb83323b1d Tidying up
ocornut 62c888177a Tweaks
ocornut e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described ()
ocornut 68962ae683 README update
ocornut 7552f48d7b ImLoadFileToMemory() default parameters
ocornut 94f085aa3e Update comments ()
ocornut 5a29eef1fa Fixed further warnings with GCC/Clang ()
ocornut e32f0931e8 Missing includes for imgui_draw.cpp ()
ocornut 52a74701f5 Updated projects to reference new files ()
Didn't update iOS example ()
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ()
ocornut 60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. ()
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (, )
ocornut dc1cb9e625 Tweak
ocornut d184730dd2 Merge branch 'trevex-master'
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ).