Fan Zhang
|
db4a6a0a
|
Merge branch 'kgdev' into 'master'
refactor canvas.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!43
|
6 年前 |
kg
|
1c77a600
|
merge
|
6 年前 |
Yuncong Zhang
|
d0ebc7bf
|
Implement ButtonBar, and Demo
|
6 年前 |
Shenhua Gu
|
fba08ca2
|
Merge branch 'text_edit' into 'master'
Text edit
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!42
|
6 年前 |
fzhangtj
|
8ee8979a
|
cleanup
|
6 年前 |
|
Yuncong Zhang
|
b844db83
|
Implement IconButton
|
6 年前 |
|
fzhangtj
|
ee73e282
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Yuncong Zhang
|
09710dc0
|
Implement RaisedButton, update DividerButtonCanvas to demo it.
|
6 年前 |
xingwei.zhu
|
d09c8037
|
polish test case
|
6 年前 |
|
Shenhua Gu
|
bfd9eb1f
|
Merge branch 'master' into 'master'
fix asset image key cache
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!41
|
6 年前 |
|
Yuncong Zhang
|
069bd77b
|
Implement FlatButton and demo
|
6 年前 |
|
xingwei.zhu
|
599d0e3e
|
code review + fix
|
6 年前 |
|
fzhangtj
|
d9549c44
|
fix
|
6 年前 |
|
Yuncong Zhang
|
206f2aa1
|
Implement divider, with Demo
|
6 年前 |
|
xingwei.zhu
|
8709fe38
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
# Conflicts:
# Runtime/material/utils.cs
|
6 年前 |
|
fzhangtj
|
84c92fc5
|
fix asset image key cache
|
6 年前 |
|
xingwei.zhu
|
7df95875
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
# Conflicts:
# Runtime/material/utils.cs
|
6 年前 |
|
Shenhua Gu
|
99dad407
|
Merge branch 'gewentao' into 'master'
add material scrollbar
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!40
|
6 年前 |
gewentao
|
2a9c59e9
|
rename interface
|
6 年前 |
|
gewentao
|
9c330130
|
update readme
|
6 年前 |
|
xingwei.zhu
|
3bf2b1b5
|
material phase 1: step 1
|
6 年前 |
|
gewentao
|
c3f13fff
|
add material scrollbar
|
6 年前 |
|
kg
|
c5d11ddb
|
refactor canvas.
|
6 年前 |
|
xingwei.zhu
|
eb8fd1b7
|
material phase 1: step 1
|
6 年前 |
|
Shenhua Gu
|
6623a936
|
Merge branch 'dragdrop_fix' into 'master'
code style cleanup + more
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!39
|
6 年前 |
|
xingwei.zhu
|
6e094a99
|
code style cleanup + more
|
6 年前 |
|
Shenhua Gu
|
5bc2f78d
|
Merge branch 'dragdrop_fix' into 'master'
code style cleanup (add 2 more rules)
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!38
|
6 年前 |
|
xingwei.zhu
|
d8e75c4a
|
code style cleanup (add 2 more rules)
|
6 年前 |
|
Shenhua Gu
|
31927862
|
Merge branch 'kgdev' into 'master'
fix typo.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!37
|
6 年前 |
|
kg
|
3e7c5232
|
fix typo.
|
6 年前 |
|
Shenhua Gu
|
2183e725
|
Merge branch 'dragdrop_fix' into 'master'
fix warnings + add two more rules to editorconfig
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!36
|
6 年前 |
Xingwei Zhu
|
ec7ec67e
|
Merge branch 'master' into 'dragdrop_fix'
# Conflicts:
# Runtime/rendering/proxy_box.cs
|
6 年前 |
|
Shenhua Gu
|
61544808
|
Merge branch 'kgdev' into 'master'
some fixes.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!35
|
6 年前 |
|
kg
|
1072753a
|
some fixes.
|
6 年前 |
|
Fan Zhang
|
0f06187a
|
Merge branch 'kgdev' into 'master'
add MaskFilter to canvas.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!34
|
6 年前 |
|
xingwei.zhu
|
9a502d9d
|
add two more rules to .editorconfig and test them on material/XXX.
|
6 年前 |
|
kg
|
5b72935c
|
fix typo.
|
6 年前 |
|
xingwei.zhu
|
71be303c
|
solve syntax error + remedy warnings
|
6 年前 |
|
kg
|
7197dd45
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
# Conflicts:
# Runtime/ui/painting/painting.cs
|
6 年前 |
|
fzhangtj
|
aacfce87
|
fix
|
6 年前 |
|
Shenhua Gu
|
3a3c970c
|
Merge branch 'dragdrop_fix' into 'master'
Material Basics
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!33
|
6 年前 |
|
xingwei.zhu
|
6820b203
|
material: Path.addPath => Path.shift
|
6 年前 |
|
fzhangtj
|
bf51eab3
|
fix
|
6 年前 |
|
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 年前 |
