ocornut
|
9896faf731
|
Merge branch 'madeso-master'
|
2016-10-01 15:00:00 +02:00 |
|
ocornut
|
2919c77bee
|
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called (#800)
|
2016-10-01 14:59:28 +02:00 |
|
ocornut
|
b96471143f
|
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
|
2016-10-01 14:56:24 +02:00 |
|
ocornut
|
28974dfbbb
|
Merge branch 'thedmd-2016-08-use_bgra_colors'
|
2016-10-01 14:29:27 +02:00 |
|
ocornut
|
68c81739bf
|
Minor tidying up following merge BGRA color PR (#844)
|
2016-10-01 14:29:12 +02:00 |
|
ocornut
|
eb0382a1c1
|
Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors
|
2016-10-01 14:19:25 +02:00 |
|
ocornut
|
dfe4683c17
|
EndGroup(): Made IsItemHovered() work when an item was activated within the group (#849) (loosely follows #840)
|
2016-10-01 14:10:24 +02:00 |
|
Michał Cichoń
|
1999c01db8
|
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
|
2016-09-26 12:00:33 +02:00 |
|
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.
|
2016-09-26 12:00:33 +02:00 |
|
ocornut
|
82dcdc9dfc
|
ShowStyleEditor: tweak font map display to show glyph details when hovered.
|
2016-09-25 15:52:04 +02:00 |
|
ocornut
|
f5b37dbc52
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 15:31:36 +02:00 |
|
ocornut
|
fea0fcb7c3
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 15:25:55 +02:00 |
|
ocornut
|
d7c518e6cc
|
ShowStyleEditor: show font map / grid in more details.
|
2016-09-25 15:22:41 +02:00 |
|
ocornut
|
6def01be5d
|
Fixed IsItemActive() lagging by one frame on initial widget activation (#840)
|
2016-09-25 14:32:38 +02:00 |
|
ocornut
|
f2699de242
|
Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479)
|
2016-09-25 14:18:10 +02:00 |
|
ocornut
|
ed279c0095
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 12:59:24 +02:00 |
|
ocornut
|
1b5bbf725b
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-09-25 12:57:22 +02:00 |
|
ocornut
|
56cdbe434d
|
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842)
|
2016-09-25 12:53:13 +02:00 |
|
ocornut
|
0f303d363a
|
Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842, #222)
|
2016-09-25 12:19:15 +02:00 |
|
ocornut
|
de9f8944ea
|
Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
|
2016-09-25 11:38:04 +02:00 |
|
ocornut
|
02cea0c3c3
|
Comment
|
2016-09-25 11:16:19 +02:00 |
|
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 |
|
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 |
|