Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-29 23:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,771 Commits 13 Branches 79 Tags 86 MiB
0be4f66d89
Commit Graph

2771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut
281898e82e Tidying up PushStyleVar/PopStyleVar() a little more (#842) 2016-09-25 11:14:10 +02:00
ocornut
c5b8c6303a Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842) 2016-09-25 11:06:14 +02:00
ocornut
35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder (#839) 2016-09-23 09:09:07 +02:00
ocornut
7f51929dc4 Tools: binary_to_compressed_c: Avoid ?? trigraphs sequences in string outputs (#839) 2016-09-23 09:06:19 +02:00
omar
18d36e6f63 Merge pull request #837 from fdb/patch-1 
Update link to Synergy repo.
 2016-09-21 21:18:56 +02:00
Frederik De Bleser
5c3f8b12b9 Update link to Synergy repo 
The Synergy repository has moved from synergy/synergy to symless/synergy.
 2016-09-21 20:26:27 +02:00
ocornut
6e87f071b8 Shutdown() clear out some remaining pointers (#836) 2016-09-20 12:41:21 +02:00
ocornut
87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df) 2016-09-19 09:32:21 +02:00
ocornut
0420ab027e Metrics: Displaying window position + moving extraneous line in IsPopupOpen(). 2016-09-16 01:09:57 +02:00
ocornut
b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829) 2016-09-13 09:18:17 +02:00
ocornut
612b17ef57 Fixing minor english typos (#827) 2016-09-11 22:02:35 +02:00
Brian Swetland
5a47346f5a ImFont: add RenderGlyph() to allow rendering of individual glyphs 2016-09-10 18:21:49 -07:00
ocornut
02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners (#824) 2016-09-10 17:43:17 +02:00
omar
012223114d Merge pull request #825 from philix/fix-build 
Examples: OSX: Fix Mac OS X build XCode project and remove cruft from Makefile
 2016-09-10 11:31:41 +02:00
Felipe Oliveira Carvalho
6e6f04f513 Fix Mac OS X build and remove cruft from Makefile 2016-09-10 11:22:40 +02:00
omar
500d19bfdf Update README.md 2016-09-08 09:12:17 +02:00
omar
b594b25be8 Update README.md 2016-09-08 09:11:29 +02:00
ocornut
f6d4ca6473 TODO list 2016-09-07 12:02:37 +02:00
ocornut
bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807) 2016-09-05 23:39:52 +02:00
ocornut
031d4e689d Examples: OpenGL3: Revert Makefile change for OSX for now (#812) 2016-09-05 22:52:45 +02:00
omar
3a699e7264 Update README.md 2016-09-05 13:40:04 +02:00
ocornut
2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback (#810) 2016-09-03 19:24:57 +02:00
ocornut
c0fcf223be Fixed assert triggering when a window has zero rendering but has a callback (#810) 2016-09-03 19:02:57 +02:00
omar
056e49eec1 Merge pull request #812 from linkemars/master 
Examples: opengl3 glfw: Mac makefile - correct name for linking opengl3_example
 2016-09-02 15:00:49 +02:00
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.
 2016-09-02 21:57:31 +09:00
omar
9af74181ce Merge pull request #804 from Loftilus/master 
Examples: Vulkan: Fix Vulkan example for use when a depth buffer is active.
 2016-09-01 09:23:46 +02:00
Gustav
08a9e78da5 fixed space issues 2016-08-29 23:35:56 +02:00
Håvard Mathisen
99b4f951b9 Fix Vulkan example for use when a depth buffer is active. 2016-08-27 19:08:24 +02:00
Gustav
5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame 2016-08-27 00:32:20 +02:00
omar
b36ba12929 Travis test fix 2016-08-25 16:20:34 +02:00
ocornut
5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:25:51 +02:00
ocornut
3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:18:09 +02:00
ocornut
ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-23 17:00:47 +02:00
ocornut
63d47bc5a4 ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 (#793) 2016-08-23 16:55:06 +02:00
ocornut
82768e05f3 Ignore list for Visual Studio 2016-08-20 13:30:42 +02:00
ocornut
787a802f2e Merge branch 'martty-master' 2016-08-20 13:30:10 +02:00
Marcell Kiss
4bc6a951fe tabs to space, remove braces 2016-08-20 13:27:03 +02:00
Marcell Kiss
3234f81cb1 maxImageCount may be 0; add missing sType; change to 1 push constant range 2016-08-20 13:08:34 +02:00
omar
622715725d Merge pull request #783 from bear24rw/patch-1 
Demo: Add null terminator to ShowStyleEditor() output_type combo options
 2016-08-19 18:00:27 +02:00
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.
 2016-08-18 11:00:23 -07:00
ocornut
cff815fd2d Merge branch 'master' into 2016-02-colorpicker 2016-08-11 23:22:15 +02:00
ocornut
0f9addb002 Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway) 2016-08-11 23:20:53 +02:00
ocornut
bfe1e163b8 Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-11 23:01:48 +02:00
ocornut
4bc3f9d1f7 Minor shuffle to ease merging branches. 2016-08-11 22:59:44 +02:00
ocornut
996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-11 22:53:26 +02:00
ocornut
6eb35b8a04 BulletText(): doesn't stop displaying at the ## mark 2016-08-07 13:53:41 +02:00
ocornut
5d1a0a6f77 Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015) 
OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible()
 2016-08-06 09:48:04 +02:00
ocornut
aa9786077c Merge branch 'thedmd-2016-08-generalized_visibility_test' 2016-08-06 09:40:38 +02:00
ocornut
b8397c2933 Tweak comments (#768) 2016-08-06 09:40:26 +02:00
ocornut
a1521534ba Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test 2016-08-06 09:36:24 +02:00