xingwei.zhu
|
2894b559
|
material: fix implicit conflicts with master
|
6 年前 |
fzhangtj
|
bdd92944
|
update
|
6 年前 |
|
xingwei.zhu
|
9dc2eebe
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into dragdrop_fix
# Conflicts:
# Runtime/material.meta
# Runtime/rendering/proxy_box.cs
|
6 年前 |
kg
|
ed524f3e
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
|
fzhangtj
|
c6467982
|
disable text rendering mesh cache
|
6 年前 |
Shenhua Gu
|
58cd3dab
|
Merge branch 'text_edit' into 'master'
fix Editable: missing onSubmitted event implement
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!28
|
6 年前 |
|
fzhangtj
|
4da440ff
|
fix Editable: missing onSubmitted event implement
|
6 年前 |
|
Shenhua Gu
|
6d294bbd
|
Merge branch 'text_edit' into 'master'
text selection overlay
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!27
|
6 年前 |
|
fzhangtj
|
2887412b
|
text selection overlay
|
6 年前 |
|
kg
|
b5a9692b
|
add MaskFilter to canvas.
|
6 年前 |
|
xingwei.zhu
|
a22dadce
|
material components: code review + .editorconfig update: add one more rule for class modifier: internal
|
6 年前 |
|
Shenhua Gu
|
6abdca18
|
Merge branch 'dragdrop_fix' into 'master'
Code Cleanup Setting （EditorConfig + DotSettings)
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!25
|
6 年前 |
|
xingwei.zhu
|
36c1fd37
|
more material components: support material button
|
6 年前 |
|
Shenhua Gu
|
d5626d83
|
Merge branch 'master' into 'master'
fix pointer position in widget canvas, position should be physical
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!26
|
6 年前 |
|
fzhangtj
|
3d1ab2d0
|
fix
|
6 年前 |
|
xingwei.zhu
|
93d770e1
|
material basics
|
6 年前 |
|
fzhangtj
|
7538a8bb
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
|
xingwei.zhu
|
1e7da4a2
|
material basics
|
6 年前 |
|
Shenhua Gu
|
85d728f0
|
Merge branch 'page_view' into 'master'
fix
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!24
|
6 年前 |
|
fzhangtj
|
651c0dbb
|
fix
|
6 年前 |
|
xingwei.zhu
|
87a8db9e
|
fix typos and add more details
|
6 年前 |
|
Shenhua Gu
|
9b29d64a
|
Merge branch 'page_view' into 'master'
Page view
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!23
|
6 年前 |
|
fzhangtj
|
3db80bfc
|
update
|
6 年前 |
|
xingwei.zhu
|
31e35589
|
fix code style profile name -> UIWidgets
update README.md, add code cleanup section
|
6 年前 |
|
fzhangtj
|
bf152f68
|
update
|
6 年前 |
|
xingwei.zhu
|
d03f80bf
|
format_editorConfig fix DotSettings
|
6 年前 |
|
fzhangtj
|
3669d263
|
Merge remote-tracking branch 'upstream/master' into page_view
|
6 年前 |
|
xingwei.zhu
|
b2103118
|
format_editorConfig
|
6 年前 |
|
Shenhua Gu
|
114aa67a
|
Merge branch 'dragdrop_fix' into 'master'
fix readonly + format issues
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!22
|
6 年前 |
|
xingwei.zhu
|
04a79c3a
|
fix readonly + format issues
|
6 年前 |
|
fzhangtj
|
1f94dc94
|
fix pointer position in widget canvas, position should be physical.
|
6 年前 |
|
Shenhua Gu
|
e3fb6bff
|
Merge branch 'master' into 'master'
fix
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!21
|
6 年前 |
|
fzhangtj
|
5832ecec
|
fix
|
6 年前 |
|
fzhangtj
|
c779a895
|
fix
|
6 年前 |
|
Shenhua Gu
|
abd4640f
|
Merge branch 'master' into 'master'
navigation bar & custom paint
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!20
|
6 年前 |
|
fzhangtj
|
d773fc6e
|
custom paint
|
6 年前 |
|
fzhangtj
|
acdd4632
|
page view
|
6 年前 |
|
fzhangtj
|
1bc56ed7
|
navigation toolbar
|
6 年前 |
Fan Zhang
|
26d239dc
|
Merge branch 'kgdev' into 'master'
add Path.contains.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!19
|
6 年前 |
|
kg
|
8ccc89d6
|
add Path.contains.
add DecorationImage and ShapeDocorations.
TODO: Gradient & Shadow.
|
6 年前 |
|
Shenhua Gu
|
7d789cc4
|
Merge branch 'dragdrop_new' into 'master'
dragdrop codes: fix Axis.none, add drag_utils and format problems
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!18
|
6 年前 |
|
xingwei.zhu
|
0e54bfe7
|
test project
|
6 年前 |
|
xingwei.zhu
|
7498399a
|
dragdrop codes: fix Axis.none, add drag_utils and format problems
|
6 年前 |
|
Shenhua Gu
|
8014ae96
|
Merge branch 'master' into 'master'
Master
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!17
|
6 年前 |
|
fzhangtj
|
f687ee0c
|
format
|
6 年前 |
|
fzhangtj
|
3ede87e3
|
fix
|
6 年前 |
|
fzhangtj
|
a3aea510
|
navigation
|
6 年前 |
|
fzhangtj
|
2f474e8b
|
update
|
6 年前 |
|
Fan Zhang
|
4bb624e6
|
Merge branch 'kgdev' into 'master'
fix mesh leak.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!16
|
6 年前 |
|
kg
|
5aa70168
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
