181 Commits (1edeea2f5a11b32970f344e3e604d03ffa390633)

Author SHA1 Message Date
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar 100d30a0a1 Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169) 8 years ago
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar 8261d9ff30 Comments (#1172, #1231) 8 years ago
omar 12d265fa31 Version 1.51 WIP tag 8 years ago
omar 5e1caaaef3 Version 1.50 8 years ago
omar c038339a4c Merge branch 'master' into 2015-02-colorpicker 8 years ago
omar 026d021df1 Demo: Fixed warnings introduced in 0828a1fd6c 8 years ago
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account 8 years ago
omar 497381dc3d Comments 8 years ago
omar 89b1497843 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 8 years ago
omar b6c0227add Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar 714beb217c Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end. 8 years ago
ocornut 68df09cf47 Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse) 8 years ago
ocornut a60b2cc645 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut 52308a54f8 Demo: comments 8 years ago
ocornut f4cf972ea9 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut fdbad2708c Ignore GCC 6 warnings (#883) 8 years ago
ocornut 775ac24d45 Fixed overzealous GCC warnings (#883) + partly undo 8553bab241 8 years ago
ocornut 8553bab241 Ignoring overzealous GCC warnings (#883) 8 years ago
ocornut ccb3db94da Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut faafcf418d Demo: Comments, even though nobody appears to read the comments. 8 years ago
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" 8 years ago
ocornut b376b68326 Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code 8 years ago
ocornut 357167f917 Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing. 8 years ago
James Fulop 6fa3aaf7c0 outdated dragging API mentioned in demo text
Looks like you changed the API on dragging, but did not update the description text for it. 
https://github.com/ocornut/imgui/issues/167
8 years ago
ocornut 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
Jeongseok Lee 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro' 8 years ago
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format. 8 years ago
ocornut 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered. 8 years ago
ocornut d7c518e6cc ShowStyleEditor: show font map / grid in more details. 8 years ago
ocornut 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842) 8 years ago
ocornut 612b17ef57 Fixing minor english typos (#827) 8 years ago
ocornut ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker 9 years ago
Max Thrun 4f389b7f6a Add null terminator to ShowStyleEditor output_type combo options
Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.
9 years ago
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker 9 years ago
ocornut de61fcc619 Minor bits 9 years ago
ocornut 1ef7980e17 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 4fddfa4b5e Demo: extra (somehow duplicate) Selectables+Columns demo 9 years ago
ocornut d6a5fd06d7 Demo: Added an extra 3-way columns demo 9 years ago
ocornut d1c073a199 Comments, tweaks 9 years ago
ocornut 5d4cf1c3f3 Version 1.50 WIP 9 years ago
ocornut adb85d800d Version 1.49 9 years ago
ocornut 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 1483a69c11 Demo: Tree: showing how to align tree node label with current x position (#324, #581) 9 years ago
ocornut a0a48f6e59 Added TreeAdvanceToLabelPos() (#581) 9 years ago
ocornut 806a146198 TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581) 9 years ago
ocornut b5521a81d4 Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection (#581) 9 years ago