Commit Graph

  • ccb3db94da Merge branch 'master' into 2016-02-colorpicker ocornut 2016-11-09 15:17:20 +0100
  • 833ed760ae update cmdline syntax in windows compilation sushitao 2016-11-09 14:53:23 +0800
  • 00d70d3eae Merge cde3c5a78e into faafcf418d Sam Hocevar 2016-11-09 06:47:55 +0000
  • faafcf418d Demo: Comments, even though nobody appears to read the comments. ocornut 2016-11-07 17:33:46 +0100
  • 3689efb726 Font: Readme about icons ocornut 2016-11-06 22:53:36 +0100
  • da9feba539 Fixed missing frame padding on title bar text when Collapse triangle is disabled ocornut 2016-11-06 22:40:47 +0100
  • 620497e466 Font: Font name include size ocornut 2016-11-06 22:21:21 +0100
  • 84f480a638 Font: Added Roboto-Medium + tweaked readme ocornut 2016-11-06 22:21:10 +0100
  • b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" ocornut 2016-11-06 21:51:20 +0100
  • b376b68326 Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code ocornut 2016-11-06 21:50:18 +0100
  • 357167f917 Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing. ocornut 2016-11-06 18:13:14 +0100
  • 907dd2ed20 Comments (#896) ocornut 2016-11-06 15:25:28 +0100
  • ddf08ec2e8 BeginChild(const char*) applies stack id to provided label (#894, #713) ocornut 2016-11-06 15:12:45 +0100
  • 32dbe836d0 Add user-facing IsPopupOpen function Matt Keeter 2016-10-29 15:33:09 -0400
  • a24c17035a Do not store compiled objects outside the project tree. Sam Hocevar 2016-10-22 13:36:49 +0200
  • 3ff1fd94d9 Define SOURCES instead of OBJS in Makefiles. Sam Hocevar 2016-10-22 13:26:39 +0200
  • 7ac0b209cd Fix path to opengl2_example in .gitignore. Sam Hocevar 2016-10-22 13:11:48 +0200
  • 7937005b25 Use make variables $@ and $^ where appropriate. Sam Hocevar 2016-10-22 13:07:43 +0200
  • e153184b40 Ensure `make clean` is idempotent. Sam Hocevar 2016-10-22 13:02:58 +0200
  • cf7750a4ce Add a rootlevel .gitignore entry for objects created by the example Makefiles. Sam Hocevar 2016-10-22 11:40:09 +0200
  • c36f7121dc Fix .gitignore entry for opengl2_example. Sam Hocevar 2016-10-22 11:39:50 +0200
  • cde3c5a78e Fix dozens of compilation warnings, mostly related to const correctness. Sam Hocevar 2016-10-22 11:34:57 +0200
  • 53126cd713 Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x) Marcell Kiss 2016-10-18 22:40:58 +0200
  • 44250caf50 Null the released resources Marcell Kiss 2016-10-18 22:07:51 +0200
  • 43e6c46c8d Merge pull request #877 from Velro/patch-1 omar 2016-10-16 18:32:13 +0200
  • 6fa3aaf7c0 outdated dragging API mentioned in demo text James Fulop 2016-10-16 12:21:38 -0400
  • dd6163241c Merge branch 'master' into 2016-02-colorpicker ocornut 2016-10-16 14:02:15 +0200
  • bdb34d1c11 Merge branch 'master' into 2016-07-navigation ocornut 2016-10-16 14:01:13 +0200
  • b3790e7549 InputText: Fixed pressing home key on last character when it isn't a trailing \n (#588, #815) ocornut 2016-10-16 13:34:47 +0200
  • 7252d93dcd stb_textedit.h Merged from master 1.9 (merged bits from #473) ocornut 2016-10-16 11:34:33 +0200
  • 46af152f72 Merge 538ee76256 into 0d3f8807c7 Matvey Soloviev 2016-10-15 14:46:55 +0000
  • 0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. (#875) ocornut 2016-10-15 11:36:43 +0200
  • d649bc485b Minor comments ocornut 2016-10-15 11:18:29 +0200
  • cb7e1c18b5 Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle (#860) ocornut 2016-10-10 22:37:59 +0200
  • 31dc7d8d63 Added ImGuiMouseCursor_None for usage by app/binding ocornut 2016-10-10 18:03:37 +0200
  • 4de35b4f30 Removed left-over empty op ocornut 2016-10-09 10:58:38 +0200
  • 1810b3ff38 Added ImGuiCorner enum to clarify some internal code ocornut 2016-10-09 10:56:23 +0200
  • d567595dde ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions ocornut 2016-10-09 10:35:01 +0200
  • abaada4224 Removed the inconsistent shadow under RenderCollapseTriangle() (~#707) ocornut 2016-10-09 10:31:39 +0200
  • 5957af8a80 Fixed not using IM_ARRAYSIZE() where appropriate ocornut 2016-10-09 10:08:03 +0200
  • fa73e5aa0e Plot: Fixed calling with values_count == 0 ocornut 2016-10-08 12:43:30 +0200
  • 51111b0ed5 FAQ clarified the ClipRect entry a little ocornut 2016-10-07 10:27:19 +0200
  • e4deb7a190 Merge remote-tracking branch 'origin' into 2016-07-navigation ocornut 2016-10-07 09:52:14 +0200
  • 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker ocornut 2016-10-07 09:52:00 +0200
  • e07d45709f ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing (#844) ocornut 2016-10-07 09:49:52 +0200
  • 7995cabce5 Merge pull request #864 from jslee02/fix-clang-unknown-warning omar 2016-10-06 21:48:00 +0200
  • 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro' Jeongseok Lee 2016-10-06 14:48:47 -0400
  • ca7e2ab0dd formatting Mikulas Florek 2016-10-06 12:25:13 +0200
  • d63d0a249a use correct font in tooltip with Push/PopFont Mikulas Florek 2016-10-06 12:23:16 +0200
  • 05b580e691 Tools: Fixed binary_to_compressed_c.cpp not to use different types on both sides of ternary op (#856) ocornut 2016-10-02 17:25:09 +0200
  • a2487bc143 Minor tweaks ocornut 2016-10-01 15:16:17 +0200
  • b67fec6877 Merge 9f8dadb659 into 9896faf731 Inflex 2016-10-01 13:01:59 +0000
  • 9896faf731 Merge branch 'madeso-master' ocornut 2016-10-01 15:00:00 +0200
  • 2919c77bee Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called (#800) ocornut 2016-10-01 14:59:28 +0200
  • b96471143f Merge branch 'master' of https://github.com/madeso/imgui into madeso-master ocornut 2016-10-01 14:56:24 +0200
  • 28974dfbbb Merge branch 'thedmd-2016-08-use_bgra_colors' ocornut 2016-10-01 14:29:27 +0200
  • 68c81739bf Minor tidying up following merge BGRA color PR (#844) ocornut 2016-10-01 14:29:12 +0200
  • eb0382a1c1 Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors ocornut 2016-10-01 14:19:25 +0200
  • dfe4683c17 EndGroup(): Made IsItemHovered() work when an item was activated within the group (#849) (loosely follows #840) ocornut 2016-10-01 14:10:24 +0200
  • c8c0b997e1 Fixed window sizing issue in directx11 Alan Yeats 2016-09-26 21:52:10 +0100
  • 785383267a Fixed Window sizing problem Alan Yeats 2016-09-26 21:49:51 +0100
  • 149e97ef40 Merge 1999c01db8 into 82dcdc9dfc Michał Cichoń 2016-09-26 10:00:50 +0000
  • 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format. Michał Cichoń 2016-08-06 10:57:52 +0200
  • d75d2b1871 Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h. Michał Cichoń 2016-08-05 11:04:05 +0200
  • 362f83d784 Avoid using ImDrawVert::pos directly, custom vertex format may contain something else than ImVec2. Michał Cichoń 2016-08-31 11:50:23 +0200
  • d89a54d22b Add rounding support to ImDrawList::AddImage Michał Cichoń 2016-08-29 14:09:55 +0200
  • 11afeef078 Add utility functions for component-wise vector multiplication and division. Michał Cichoń 2016-08-29 14:09:17 +0200
  • 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered. ocornut 2016-09-25 15:52:04 +0200
  • f5b37dbc52 Merge remote-tracking branch 'origin' into 2016-07-navigation ocornut 2016-09-25 15:31:36 +0200
  • fea0fcb7c3 Merge remote-tracking branch 'origin' into 2016-07-navigation ocornut 2016-09-25 15:25:55 +0200
  • d7c518e6cc ShowStyleEditor: show font map / grid in more details. ocornut 2016-09-25 15:22:41 +0200
  • 6def01be5d Fixed IsItemActive() lagging by one frame on initial widget activation (#840) ocornut 2016-09-25 14:32:38 +0200
  • f2699de242 Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479) ocornut 2016-09-25 14:18:10 +0200
  • ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation ocornut 2016-09-25 12:59:24 +0200
  • 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker ocornut 2016-09-25 12:57:22 +0200
  • 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842) ocornut 2016-09-25 12:53:13 +0200
  • 0f303d363a Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842, #222) ocornut 2016-09-25 12:19:15 +0200
  • de9f8944ea Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect* ocornut 2016-09-25 11:38:04 +0200
  • 02cea0c3c3 Comment ocornut 2016-09-25 11:16:19 +0200
  • 281898e82e Tidying up PushStyleVar/PopStyleVar() a little more (#842) ocornut 2016-09-25 11:14:10 +0200
  • c5b8c6303a Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842) ocornut 2016-09-25 11:06:14 +0200
  • 35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder (#839) ocornut 2016-09-23 09:09:07 +0200
  • 7f51929dc4 Tools: binary_to_compressed_c: Avoid ?? trigraphs sequences in string outputs (#839) ocornut 2016-09-23 09:06:09 +0200
  • 18d36e6f63 Merge pull request #837 from fdb/patch-1 omar 2016-09-21 21:18:56 +0200
  • 5c3f8b12b9 Update link to Synergy repo Frederik De Bleser 2016-09-21 20:26:27 +0200
  • 6e87f071b8 Shutdown() clear out some remaining pointers (#836) ocornut 2016-09-20 12:41:21 +0200
  • 87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df) ocornut 2016-09-19 09:32:21 +0200
  • 0420ab027e Metrics: Displaying window position + moving extraneous line in IsPopupOpen(). ocornut 2016-09-16 01:09:57 +0200
  • b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829) ocornut 2016-09-13 09:18:17 +0200
  • ea9efb61ec Merge b73b0215e1 into 612b17ef57 Michał Cichoń 2016-09-11 21:45:12 +0000
  • 612b17ef57 Fixing minor english typos (#827) ocornut 2016-09-11 22:02:35 +0200
  • 082f3eb07a Fix typo threshhold Feram 2016-09-11 18:44:02 +0000
  • d3f248c65d Fix typo suceeded Feram 2016-09-11 18:44:02 +0000
  • abd7e9236d Fix typo seeked Feram 2016-09-11 18:44:02 +0000
  • a333464113 Fix typo publically Feram 2016-09-11 18:44:02 +0000
  • afa1add1b4 Fix typo prefered Feram 2016-09-11 18:44:02 +0000
  • 63c77edc4d Fix typo preceeding Feram 2016-09-11 18:44:02 +0000
  • eca91b0ede Fix typo occured Feram 2016-09-11 18:44:02 +0000
  • 5a3af2c72a Fix typo dependant Feram 2016-09-11 18:44:02 +0000
  • e0d2094493 Fix incorrect an Feram 2016-09-11 18:44:02 +0000