Commit Graph

5012 Commits (e32256b4b413ce37ebc37d6f42c924f6d6ee9119)
 

Author SHA1 Message Date
ocornut b96471143f Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
ocornut 28974dfbbb Merge branch 'thedmd-2016-08-use_bgra_colors'
ocornut 68c81739bf Minor tidying up following merge BGRA color PR ()
ocornut eb0382a1c1 Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors
ocornut dfe4683c17 EndGroup(): Made IsItemHovered() work when an item was activated within the group () (loosely follows )
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
Michał Cichoń d75d2b1871 Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h.
When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.
ocornut 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered.
ocornut f5b37dbc52 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut fea0fcb7c3 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut d7c518e6cc ShowStyleEditor: show font map / grid in more details.
ocornut 6def01be5d Fixed IsItemActive() lagging by one frame on initial widget activation ()
ocornut f2699de242 Fix using IsItemActive() after EndGroup() or any widget using groups (, )
ocornut ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ()
ocornut 0f303d363a Refactor text alignment options to use ImVec2, removed ImGuiAlign (, )
ocornut de9f8944ea Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
ocornut 02cea0c3c3 Comment
ocornut 281898e82e Tidying up PushStyleVar/PopStyleVar() a little more ()
ocornut c5b8c6303a Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ()
ocornut 35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder ()
ocornut 7f51929dc4 Tools: binary_to_compressed_c: Avoid ?? trigraphs sequences in string outputs ()
omar 18d36e6f63 Merge pull request from fdb/patch-1
Update link to Synergy repo.
Frederik De Bleser 5c3f8b12b9 Update link to Synergy repo
The Synergy repository has moved from synergy/synergy to symless/synergy.
ocornut 6e87f071b8 Shutdown() clear out some remaining pointers ()
ocornut 87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df)
ocornut 0420ab027e Metrics: Displaying window position + moving extraneous line in IsPopupOpen().
ocornut b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ()
ocornut 612b17ef57 Fixing minor english typos ()
Brian Swetland 5a47346f5a ImFont: add RenderGlyph() to allow rendering of individual glyphs
ocornut 02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ()
omar 012223114d Merge pull request from philix/fix-build
Examples: OSX: Fix Mac OS X build XCode project and remove cruft from Makefile
Felipe Oliveira Carvalho 6e6f04f513 Fix Mac OS X build and remove cruft from Makefile
omar 500d19bfdf Update README.md
omar b594b25be8 Update README.md
ocornut f6d4ca6473 TODO list
ocornut bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ()
ocornut 031d4e689d Examples: OpenGL3: Revert Makefile change for OSX for now ()
omar 3a699e7264 Update README.md
ocornut 2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ()
ocornut c0fcf223be Fixed assert triggering when a window has zero rendering but has a callback ()
omar 056e49eec1 Merge pull request from linkemars/master
Examples: opengl3 glfw: Mac makefile - correct name for linking opengl3_example
Kun Lin aa0cb13aa4 Correct name for linking opengl3_example
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.

Changed this made the compilation on my Mac successfully.
omar 9af74181ce Merge pull request from Loftilus/master
Examples: Vulkan: Fix Vulkan example for use when a depth buffer is active.
Gustav 08a9e78da5 fixed space issues
Håvard Mathisen 99b4f951b9 Fix Vulkan example for use when a depth buffer is active.
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame
omar b36ba12929 Travis test fix
ocornut 5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)