fzhangtj
|
a1b34c06
|
add packman template
|
6 年前 |
|
fzhangtj
|
2d3ecb43
|
sample
This reverts commit a68481b
|
6 年前 |
|
fzhangtj
|
c9f82a6b
|
handle select event in widget canvas
|
6 年前 |
Shenhua Gu
|
60204f64
|
Merge branch 'master' into 'master'
handle select event in widget canvas
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!1
|
6 年前 |
kg
|
94e6f86f
|
Merge remote-tracking branch 'origin/master'
|
6 年前 |
|
fzhangtj
|
2912d81b
|
update
|
6 年前 |
|
fzhangtj
|
959216d2
|
redux sample
|
6 年前 |
|
Shenhua Gu
|
57c62572
|
Merge branch 'master' into 'master'
redux sample
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!3
|
6 年前 |
|
kg
|
6aa80211
|
format code. use setting repository.
|
6 年前 |
Fan Zhang
|
fa740be6
|
Merge branch 'kgdev' into 'master'
fix font and finalizer race condition in webgl
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!11
|
6 年前 |
|
fzhangtj
|
a3aea510
|
navigation
|
6 年前 |
|
fzhangtj
|
3ede87e3
|
fix
|
6 年前 |
|
Shenhua Gu
|
8014ae96
|
Merge branch 'master' into 'master'
Master
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!17
|
6 年前 |
xingwei.zhu
|
7498399a
|
dragdrop codes: fix Axis.none, add drag_utils and format problems
|
6 年前 |
|
xingwei.zhu
|
0e54bfe7
|
test project
|
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 年前 |
|
fzhangtj
|
1bc56ed7
|
navigation toolbar
|
6 年前 |
|
fzhangtj
|
acdd4632
|
page view
|
6 年前 |
|
fzhangtj
|
d773fc6e
|
custom paint
|
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
|
3669d263
|
Merge remote-tracking branch 'upstream/master' into page_view
|
6 年前 |
|
fzhangtj
|
bf152f68
|
update
|
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
|
7538a8bb
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
|
xingwei.zhu
|
36c1fd37
|
more material components: support material button
|
6 年前 |
|
xingwei.zhu
|
a22dadce
|
material components: code review + .editorconfig update: add one more rule for class modifier: internal
|
6 年前 |
|
fzhangtj
|
2887412b
|
text selection overlay
|
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
|
4da440ff
|
fix Editable: missing onSubmitted event implement
|
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 年前 |
|
kg
|
ed524f3e
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
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 年前 |
|
xingwei.zhu
|
2894b559
|
material: fix implicit conflicts with master
|
6 年前 |
|
Shenhua Gu
|
3a3c970c
|
Merge branch 'dragdrop_fix' into 'master'
Material Basics
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!33
|
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 年前 |
|
xingwei.zhu
|
6e094a99
|
code style cleanup + more
|
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 年前 |
gewentao
|
c3f13fff
|
add material scrollbar
|
6 年前 |
|
gewentao
|
2a9c59e9
|
rename interface
|
6 年前 |
|
Shenhua Gu
|
99dad407
|
Merge branch 'gewentao' into 'master'
add material scrollbar
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!40
|
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 年前 |
|
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 年前 |
Yuncong Zhang
|
206f2aa1
|
Implement divider, with Demo
|
6 年前 |
|
Yuncong Zhang
|
069bd77b
|
Implement FlatButton and demo
|
6 年前 |
|
xingwei.zhu
|
d09c8037
|
polish test case
|
6 年前 |
|
Yuncong Zhang
|
09710dc0
|
Implement RaisedButton, update DividerButtonCanvas to demo it.
|
6 年前 |
|
fzhangtj
|
ee73e282
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Yuncong Zhang
|
d0ebc7bf
|
Implement ButtonBar, and Demo
|
6 年前 |
|
kg
|
1c77a600
|
merge
|
6 年前 |
|
Yuncong Zhang
|
c05d7130
|
Merge branch 'material' into material_yczhang
|
6 年前 |
Xingwei Zhu
|
8be59e50
|
Merge branch 'material_yczhang' into 'material'
Material yczhang
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!46
|
6 年前 |
|
xingwei.zhu
|
80810ac2
|
fix yuncong's commits
|
6 年前 |
|
Shenhua Gu
|
62021509
|
Merge branch 'material' into 'master'
Material Phase 2 (fundamental layouts & widgets)
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!48
|
6 年前 |
|
xingwei.zhu
|
78576dc3
|
scroller version 1
|
6 年前 |
|
fzhangtj
|
1262bcba
|
text edit keyboard
|
6 年前 |
|
xingwei.zhu
|
93a9720d
|
scroller: code style cleanup + add addPointerScroll specifically for PointScrollEvent, avoid potential pollution on PointerEvent process pipeline
|
6 年前 |
|
xingwei.zhu
|
9f2c989a
|
scroller: support editor
|
6 年前 |
Wentao Ge
|
fc63e9c0
|
Merge branch 'material' into 'master'
mouse scroll support
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!52
|
6 年前 |
|
Yuncong Zhang
|
503f7bec
|
Merge branch 'master' into splay_tree
|
6 年前 |
|
fzhangtj
|
fe782218
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Shenhua Gu
|
9ddb1163
|
Merge branch 'text_edit' into 'master'
Text edit
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!56
|
6 年前 |
|
xingwei.zhu
|
ab8630b2
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
# Conflicts:
# Runtime/editor/editor_window.cs
# Runtime/ui/txt/paragraph.cs
|
6 年前 |
|
fzhangtj
|
8eb591e6
|
ability to specify device pixel ratio manually
|
6 年前 |
|
Shenhua Gu
|
7229064f
|
Merge branch 'master' into 'master'
android/ios/webgl device pixel ratio to unity
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!61
|
6 年前 |
|
Yuncong Zhang
|
7bea6c4c
|
Change double to float.
|
6 年前 |
|
Yuncong Zhang
|
d821002b
|
Remove all (float) and replace Math with Mathf.
|
6 年前 |
|
Xingwei Zhu
|
befbb3d0
|
Merge branch 'double_to_float' into 'master'
Change double to float.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!68
|
6 年前 |
|
kg
|
bed74c09
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
|
fzhangtj
|
f3f914dc
|
fix line break
|
6 年前 |
|
Shenhua Gu
|
5667400e
|
Merge branch 'master' into 'master'
Master
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!86
|
6 年前 |
|
xingwei.zhu
|
8ca0de57
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material2
|
6 年前 |
|
fzhangtj
|
0b003a69
|
WidgetCanvas => UIWidgetsPanel
|
6 年前 |
|
fzhangtj
|
15454571
|
remove window parameter
|
6 年前 |
|
Shenhua Gu
|
a76b4fe6
|
Merge branch 'widgets_panel' into 'master'
WidgetCanvas => UIWidgetsPanel
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!92
|
6 年前 |
|
fzhangtj
|
f9488f4b
|
fix sample
|
6 年前 |
|
fzhangtj
|
4bf67a5a
|
ios keyboard
|
6 年前 |
|
Fan Zhang
|
698ddedd
|
Merge branch 'widgets_panel' into 'master'
fix sample
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!95
|
6 年前 |
|
kg
|
781f06bb
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
# Conflicts:
# Runtime/ui/painting/canvas.cs
# Runtime/ui/painting/canvas_impl.cs
|
6 年前 |
|
xingwei.zhu
|
cdc72bdf
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
xingwei.zhu
|
a03ee997
|
fix bug
|
6 年前 |
|
Shenhua Gu
|
671eeb8d
|
Merge branch 'material' into 'master'
Material app
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!93
|
6 年前 |
|
kg
|
c523fe54
|
some changes.
|
6 年前 |
|
fzhangtj
|
14cf548e
|
fix
|
6 年前 |
|
xingwei.zhu
|
8720c91a
|
material fix minor
|
6 年前 |
|
Shenhua Gu
|
b9c5f145
|
Merge branch 'material' into 'master'
sliversafearea
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!96
|
6 年前 |
|
kg
|
93ff04d4
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
# Conflicts:
# Runtime/material/app.cs.meta
# Runtime/material/page.cs.meta
# Runtime/material/page_transitions_theme.cs.meta
|
6 年前 |
|
xingwei.zhu
|
9e9a2bcf
|
performanceoverlay layer
|
6 年前 |
|
Fan Zhang
|
84b2dd8a
|
Merge branch 'kgdev' into 'master'
some changes.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!98
|
6 年前 |
|
xingwei.zhu
|
5f884640
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Shenhua Gu
|
d757df93
|
Merge branch 'material' into 'master'
performanceoverlay layer
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!97
|
6 年前 |
|
kg
|
20c03b02
|
more materials.
|
6 年前 |
|
Xingwei Zhu
|
2d79eef4
|
Merge branch 'kgdev' into 'master'
more materials.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!102
|
6 年前 |
|
Yuncong Zhang
|
68c89d27
|
Fix ObjectFinder item click bug.
|
6 年前 |
|
xingwei.zhu
|
ee26e999
|
scaffold test sample
|
6 年前 |
|
kg
|
3e36490d
|
fix test sample.
|
6 年前 |
|
Shenhua Gu
|
87f76db8
|
Merge branch 'kgdev' into 'master'
fix test sample.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!113
|
6 年前 |
|
xingwei.zhu
|
374b5ae2
|
scaffold test sample
|
6 年前 |
|
kg
|
e7bfd366
|
add texture sample.
|
6 年前 |
|
fzhangtj
|
ece17ad8
|
Merge remote-tracking branch 'upstream/master' into widgets_panel
|
6 年前 |
|
Fan Zhang
|
cd1b9fec
|
Merge branch 'kgdev' into 'master'
add texture sample.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!115
|
6 年前 |
|
xingwei.zhu
|
22fb229a
|
scaffold test sample fix materialApp
|
6 年前 |
|
fzhangtj
|
d066a685
|
fix media query issue
|
6 年前 |
|
Shenhua Gu
|
5d4cea78
|
Merge branch 'keyboard' into 'master'
Keyboard
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!114
|
6 年前 |
|
fzhangtj
|
b89636b7
|
Merge remote-tracking branch 'upstream/master' into keyboard
|
6 年前 |
|
xingwei.zhu
|
854d9b4d
|
code style + bug fix
|
6 年前 |
|
Shenhua Gu
|
178f4872
|
Merge branch 'keyboard' into 'master'
fix media query in startup
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!116
|
6 年前 |
|
xingwei.zhu
|
2b32d116
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Fan Zhang
|
7d4e3860
|
Merge branch 'fix_object_sample' into 'master'
Fix ObjectFinder item click bug.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!119
|
6 年前 |
|
xingwei.zhu
|
9f7fd9d6
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Yuncong Zhang
|
e4d6d823
|
Temp store.
|
6 年前 |
|
xingwei.zhu
|
976e5f94
|
localizations fix
|
6 年前 |
|
xingwei.zhu
|
b5e46f32
|
snackbar fix
|
6 年前 |
|
xingwei.zhu
|
dcaaef14
|
floating action button add
|
6 年前 |
|
xingwei.zhu
|
475f6188
|
drawer fix
|
6 年前 |
|
xingwei.zhu
|
06f4ef1d
|
bottomsheet fix
|
6 年前 |
|
xingwei.zhu
|
d2118023
|
bottom sheet example polish
|
6 年前 |
|
Shenhua Gu
|
de6befa5
|
Merge branch 'material' into 'master'
Material Scaffold
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!120
|
6 年前 |
|
Yuncong Zhang
|
19720d78
|
Merge branch 'master' into gallery
|
6 年前 |
|
fzhangtj
|
96b87e98
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Yuncong Zhang
|
e38fe46a
|
Tmp store.
|
6 年前 |
|
xingwei.zhu
|
a43c0c14
|
promise bug fix
|
6 年前 |
|
Yuncong Zhang
|
8f55405d
|
Tmp store.
|
6 年前 |
|
Shenhua Gu
|
39d1a826
|
Merge branch 'material' into 'master'
Material
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!122
|
6 年前 |
|
kg
|
08783d15
|
some fixes.
|
6 年前 |
|
xingwei.zhu
|
4f7de192
|
material tab widgets
|
6 年前 |
|
Shenhua Gu
|
e5662d52
|
Merge branch 'kgdev' into 'master'
some fixes.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!126
|
6 年前 |
|
xingwei.zhu
|
47597a02
|
material tab widgets check + code style
|
6 年前 |
|
Shenhua Gu
|
a542dc73
|
Merge branch 'material' into 'master'
Material tab widget
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!129
|
6 年前 |
|
kg
|
416e2cfd
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
|
Yuncong Zhang
|
97fc1ca3
|
Merge branch 'master' into yczhang_material
|
6 年前 |
|
xingwei.zhu
|
5642b2db
|
table widget
|
6 年前 |
|
Yuncong Zhang
|
34c69532
|
Merge branch 'yczhang_material' into gallery
|
6 年前 |
|
Yuncong Zhang
|
b5e22ca9
|
Finish buttons_demo
|
6 年前 |
|
Yuncong Zhang
|
ae31c8b2
|
Tmp store.
|
6 年前 |
|
Shenhua Gu
|
7dcdf1ad
|
Merge branch 'material' into 'master'
table widget
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!133
|
6 年前 |
|
Yuncong Zhang
|
a0f44d32
|
Implement Banner.
|
6 年前 |
|
Yuncong Zhang
|
29fa7700
|
Implement animated icons.
|
6 年前 |
|
Yuncong Zhang
|
918cf889
|
Implement backdrop.
|
6 年前 |
|
Yuncong Zhang
|
ecfc433b
|
Temp store.
|
6 年前 |
|
fzhangtj
|
6752ce45
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Yuncong Zhang
|
719028aa
|
Temp store.
|
6 年前 |
|
xingwei.zhu
|
2d70f843
|
Merge branch 'gallery' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Yuncong Zhang
|
9291f272
|
Temp store.
|
6 年前 |
|
Yuncong Zhang
|
ab1a8576
|
Temp store.
|
6 年前 |
|
Yuncong Zhang
|
9871138b
|
Fix some issues.
|
6 年前 |
|
Yuncong Zhang
|
bfbc357f
|
Fix issue.
|
6 年前 |
|
Yuncong Zhang
|
4f62ed91
|
Merge branch 'master' into gallery
|
6 年前 |
|
Yuncong Zhang
|
a760b713
|
Fix an issue.
|
6 年前 |
|
xingwei.zhu
|
242c1e08
|
Merge branch 'gallery' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Yuncong Zhang
|
6ac478de
|
Run code cleanup
|
6 年前 |
|
Yuncong Zhang
|
efab0459
|
Fix issue.
|
6 年前 |
|
Yuncong Zhang
|
e5f70077
|
Implement ColorsDemo.
|
6 年前 |
|
Xingwei Zhu
|
fc08aae4
|
Merge branch 'gallery' into 'master'
Gallery
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!137
|
6 年前 |
|
xingwei.zhu
|
a2514811
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
6 年前 |
|
Yuncong Zhang
|
11206008
|
Implement ContactsDemo and Unity logo switching with theme.
|
6 年前 |
|
Yuncong Zhang
|
827c7fc4
|
Fix some issues.
|
6 年前 |
|
Yuncong Zhang
|
5d88a2a1
|
Implement TypographyDemo.
|
6 年前 |
|
Shenhua Gu
|
b32bcfaa
|
Merge branch 'gallery' into 'master'
Gallery
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!140
|
6 年前 |
|
kg
|
4e976a76
|
fix async promise, to load image at first frame.
|
6 年前 |
|
Shenhua Gu
|
920bedf6
|
Merge branch 'kgdev' into 'master'
fix some obvious typos :)
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!142
|
6 年前 |
|
fzhangtj
|
c067eec3
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
Yuncong Zhang
|
dc7e8b0b
|
Implement CardsDemo.
|
6 年前 |
|
Yuncong Zhang
|
41ffe913
|
Implement BackdropDemo.
|
6 年前 |
|
Yuncong Zhang
|
84bc0348
|
Implement BottomAppBar and BottomAppBarDemo
|
6 年前 |
|
Xingwei Zhu
|
82c377ea
|
Merge branch 'gallery' into 'master'
Gallery
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!146
|
6 年前 |
|
Yuncong Zhang
|
d923f0c4
|
Implement BottomNavigationBar.
|
6 年前 |
|
Yuncong Zhang
|
19d64981
|
Clear warnings
|
6 年前 |
|
Shenhua Gu
|
e3c90b93
|
Merge branch 'gallery' into 'master'
Gallery
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!151
|
6 年前 |
|
xingwei.zhu
|
380ecced
|
material shadow basic version
|
6 年前 |
|
xingwei.zhu
|
b4310858
|
material theatre scene
|
6 年前 |
|
Shenhua Gu
|
14909782
|
Merge branch 'material' into 'master'
material shadow basic version
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!156
|
6 年前 |
|
fzhangtj
|
d217b35c
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
kg
|
0950992e
|
Run Gallery in editor as well.
|
6 年前 |
|
kg
|
5a2c3195
|
Run Gallery in editor as well.
|
6 年前 |
|
fzhangtj
|
ded9350d
|
custom font weight & custom font interface change
|
6 年前 |
|
fzhangtj
|
5b6ac92c
|
update
|
6 年前 |
|
Shenhua Gu
|
ebf1d64b
|
Merge branch 'text_edit' into 'master'
custom font weight & custom font interface change
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!164
|
6 年前 |
|
fzhangtj
|
2a5494d4
|
fix Awake warning
|
6 年前 |
|
Shenhua Gu
|
461cc1e2
|
Merge branch 'text_edit' into 'master'
fix Awake warning
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!165
|
6 年前 |
|
Shenhua Gu
|
87d54905
|
Merge branch 'material' into 'master'
material theatre scene
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!166
|
6 年前 |
|
kg
|
7d8a57f1
|
Merge branches 'kgdev' and 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
|
xingwei.zhu
|
84941b56
|
material theatre scene - load font in Awake
|
6 年前 |
|
Shenhua Gu
|
28b766f3
|
Merge branch 'material' into 'master'
material theatre scene - load font in Awake
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!167
|
6 年前 |
|
kg
|
c8bba724
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into kgdev
|
6 年前 |
|
kg
|
e869359f
|
Run Gallery in editor as well.
|
6 年前 |
|
Shenhua Gu
|
b532c4a9
|
Merge branch 'kgdev' into 'master'
Run Gallery in editor as well.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!168
|
6 年前 |
|
fzhangtj
|
d6a6db25
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
fzhangtj
|
ed675598
|
text field
|
6 年前 |
|
xingwei.zhu
|
80374017
|
constraint UIWidgetsGalleryEditor and UIWidgetsTheatre to editor-only mode
|
6 年前 |
|
fzhangtj
|
a497f6a5
|
text field
|
6 年前 |
GitHub
|
a6259a7f
|
Merge pull request #56 from UnityTech/xwzhu
constraint UIWidgetsGalleryEditor and UIWidgetsTheatre to editor-only…
|
6 年前 |
|
xingwei.zhu
|
101d9141
|
commit missed files
|
6 年前 |
|
GitHub
|
f7f891af
|
Merge pull request #57 from UnityTech/xwzhu
commit missed files
|
6 年前 |
|
xingwei.zhu
|
901c19c7
|
performanceoverlay
|
6 年前 |
|
fzhangtj
|
e6fd54f3
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
fzhangtj
|
ec3cf29f
|
WindowProvider.of(GameObject)
|
6 年前 |
|
xingwei.zhu
|
7bfcfea0
|
attach UIWidgets to Panels under canvas + add more samples to UIWidgetsTheatre
|
6 年前 |
|
GitHub
|
fd26e5ca
|
Merge pull request #58 from fzhangtj/text_edit
text field
|
6 年前 |
|
fzhangtj
|
1461d376
|
fix font size 0 issue & text background
|
6 年前 |
|
GitHub
|
23ec8c83
|
Merge pull request #62 from UnityTech/xwzhu
performanceoverlay
|
6 年前 |
|
GitHub
|
62a01e16
|
Merge pull request #63 from UnityTech/xwzhu
attach UIWidgets to Panels under canvas + add more samples to UIWidge…
|
6 年前 |
|
fzhangtj
|
0723a160
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
6 年前 |
|
GitHub
|
e05771c4
|
Merge pull request #65 from fzhangtj/text_edit
fix font size 0 issue & text background
|
6 年前 |
|
GitHub
|
a0e4cb7c
|
Merge branch 'master' into translate
|
6 年前 |
|
kg
|
fa1b8e44
|
remove Awake.
|
6 年前 |
|
GitHub
|
3d395cf8
|
Merge pull request #72 from UnityTech/kgdev
remove Awake.
|
6 年前 |
|
kg
|
ee3832fe
|
move redux from sample to runtime.
add thunk middleware.
|
6 年前 |
|
kg
|
ae4ceacc
|
move redux from sample to runtime.
add thunk middleware.
|
6 年前 |
|
GitHub
|
65af4c2e
|
Merge pull request #82 from UnityTech/kgdev
move redux from sample to runtime.
|
6 年前 |
|
Yuncong Zhang
|
98c48536
|
Complete Shrine Demo in Gallery.
|
6 年前 |
|
fzhangtj
|
1a40fc57
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
|
Yuncong Zhang
|
66bd720f
|
Code cleanup.
|
6 年前 |
|
fzhangtj
|
153d7f74
|
update
|
6 年前 |
|
GitHub
|
0fc20dab
|
Merge pull request #84 from fzhangtj/master
WindowProvider.of(GameObject)
|
6 年前 |
|
xingwei.zhu
|
29f20ef9
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into xwzhu
# Conflicts:
# Runtime/engine/UIWidgetsPanel.cs
|
6 年前 |
|
GitHub
|
c8187334
|
Merge pull request #85 from UnityTech/yczhang
Yczhang
|
6 年前 |
|
fzhangtj
|
96329329
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
Yuncong
|
a103c01c
|
Merge branch 'master' into yczhang
|
6 年前 |
|
kg
|
ae4a0018
|
Merge branches 'kgdev' and 'master' of github.com:UnityTech/UIWidgets into kgdev
|
6 年前 |
|
Yuncong Zhang
|
ea9b4c16
|
Fix shrine null reference issue.
|
6 年前 |
|
Yuncong Zhang
|
9813cb26
|
Merge branch 'yczhang' into antialias
|
6 年前 |
|
GitHub
|
0c130835
|
Merge pull request #86 from UnityTech/yczhang
Set antiAliasing, fix ShrineDemo, implement GridView ReorderableListView RefreshIndicator UserAccountsDrawerHeader.
|
6 年前 |
|
kg
|
91ed3f2d
|
refine antiAliasing.
|
6 年前 |
|
GitHub
|
dbb685b0
|
Merge pull request #95 from UnityTech/kgdev
some fixes.
|
6 年前 |
|
Yuncong Zhang
|
d7d9ef27
|
Tmp store.
|
6 年前 |
|
Yuncong Zhang
|
37ff2101
|
Implement Animation Demo.
|
6 年前 |
|
Yuncong Zhang
|
9e2df4ba
|
Show Bottom Sheet.
|
6 年前 |
|
Yuncong Zhang
|
9b6f48ae
|
Implement persistent bottom sheet demo.
|
6 年前 |
|
Yuncong Zhang
|
e350d2ec
|
Update.
|
6 年前 |
|
Yuncong Zhang
|
e17c522a
|
Fix some style issues.
|
6 年前 |
|
Yuncong Zhang
|
1a8a8dd3
|
Tmp store.
|
6 年前 |
|
GitHub
|
2cae7c65
|
Merge pull request #122 from UnityTech/yczhang
Fix some style issues.
|
6 年前 |
|
xingwei.zhu
|
f9c0307f
|
Merge branch 'master' of github.com:UnityTech/UIWidgets
|
6 年前 |
|
Yuncong Zhang
|
e6fb37e1
|
Tmp store.
|
6 年前 |
|
Yuncong Zhang
|
bf6f0c01
|
Implement ChipDemo.
|
5 年前 |
|
fzhangtj
|
d0833e0d
|
letter&word spacing
|
6 年前 |
|
xingwei.zhu
|
23f17048
|
pointer hover recognizer on TextSpan
|
5 年前 |
|
xingwei.zhu
|
7f02481a
|
refine code
|
5 年前 |
|
xingwei.zhu
|
f6b691b7
|
restore samples
|
5 年前 |
|
xingwei.zhu
|
430675fb
|
test hover sample added
|
5 年前 |
|
GitHub
|
d18becd3
|
Merge pull request #132 from fzhangtj/master
letter&word spacing
|
6 年前 |
|
GitHub
|
30995c89
|
Merge pull request #139 from UnityTech/textselection
Textselection
|
5 年前 |
|
Yuncong Zhang
|
79633ac6
|
Update expansion tile and flexible space bar. Fix bottom app bar demo.
|
5 年前 |
|
Yuncong Zhang
|
7bc1cd08
|
Merge branch 'yczhang' into gallery
|
5 年前 |
|
Yuncong Zhang
|
b6e3b5d4
|
Fix chip.
|
5 年前 |
|
GitHub
|
e6ecf4de
|
Merge pull request #151 from UnityTech/gallery
Gallery
|
5 年前 |
|
xingwei.zhu
|
c92533b5
|
slider
|
5 年前 |
|
GitHub
|
2f39a91a
|
Merge pull request #155 from UnityTech/slider
Slider
|
5 年前 |
|
Yuncong Zhang
|
38f23b4b
|
Merge branch 'match_flutter12' into yczhang
|
5 年前 |
|
Yuncong Zhang
|
c2febf37
|
Merge branch 'master' into yczhang
|
5 年前 |
|
Yuncong Zhang
|
8b890902
|
Merge branch 'yczhang' into match_flutter12
|
5 年前 |
|
Yuncong Zhang
|
33462b90
|
Update editable text, and some samples.
|
5 年前 |
|
Yuncong Zhang
|
6f2578e2
|
Merge branch 'master' into yczhang
|
5 年前 |
|
Yuncong Zhang
|
cac6a69b
|
Merge branch 'yczhang' into match_flutter12
|
5 年前 |
|
xingwei.zhu
|
090a1318
|
painting -- image
|
5 年前 |
|
GitHub
|
1d3e556e
|
Merge pull request #159 from UnityTech/textselection
Textselection
|
5 年前 |
|
Yuncong Zhang
|
70b9dbe2
|
Fix some issues. Add samples.
|
5 年前 |
|
xingwei.zhu
|
7d4cd4a7
|
fix sample errors
|
5 年前 |
|
GitHub
|
8f37bd6f
|
Merge pull request #160 from UnityTech/textselection
fix sample errors
|
5 年前 |
|
Yuncong Zhang
|
02a9e9e9
|
Merge branch 'yczhang' of https://github.com/UnityTech/UIWidgets into yczhang
|
5 年前 |
|
Yuncong Zhang
|
ca8147fa
|
Test Material Themes.
|
5 年前 |
|
Yuncong Zhang
|
b556cd02
|
Update Text Input Sample.
|
5 年前 |
|
GitHub
|
302c2b32
|
Merge pull request #152 from UnityTech/yczhang
Yczhang
|
5 年前 |
|
xingwei.zhu
|
b7839a20
|
mouse tracking (refer to 1811d574 (diff-f41d041ddd3fe665cc9e123f992bb5e0))
|
5 年前 |
|
kg
|
60aee8d0
|
1. fix some bugs in notched shape.
2. add conicTo, arcToPoint in canvas.
3. fix some bugs in the animation.
|
5 年前 |
|
kg
|
5a817602
|
1. refine assert. defer message generation.
2. refine Path.
|
5 年前 |
|
GitHub
|
ad739fb1
|
Merge pull request #162 from UnityTech/kgdev
some fixes and improvements.
|
5 年前 |
|
xingwei.zhu
|
59052b60
|
1.0 -> 1.2
|
5 年前 |
|
xingwei.zhu
|
c96cecdc
|
scale gesture
|
5 年前 |
|
xingwei.zhu
|
eba53870
|
code style
|
5 年前 |
|
xingwei.zhu
|
61a6aabc
|
fix minor bugs
|
5 年前 |
|
xingwei.zhu
|
c5bfc1b0
|
SUPPORT WEBGL COPY-PASTE
|
5 年前 |
|
GitHub
|
90af3128
|
Merge pull request #164 from UnityTech/gesture
Gesture
|
5 年前 |
|
GitHub
|
98aaab40
|
Merge pull request #166 from UnityTech/slider
1.0 -> 1.2
|
5 年前 |
|
kg
|
0f456b29
|
Merge branches 'kgdev' and 'master' of github.com:UnityTech/UIWidgets into kgdev
|
5 年前 |
|
xingwei.zhu
|
447159ee
|
fix: floatTween could be nullable in animatedOpacity
|
5 年前 |
|
GitHub
|
11e79d4f
|
Merge pull request #170 from UnityTech/slider
Slider
|
5 年前 |
|
xingwei.zhu
|
ecc57ee8
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into iphoneplus_view
|
5 年前 |
|
xingwei.zhu
|
b0400b19
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into mouse_tracking
# Conflicts:
# Samples/UIWidgetsGallery/gallery/app.cs
|
5 年前 |
|
GitHub
|
0d09b470
|
Merge pull request #184 from UnityTech/iphoneplus_view
webgl copy-paste text
|
5 年前 |
|
xingwei.zhu
|
b334664e
|
fix sample error
|
5 年前 |
|
xingwei.zhu
|
3ecb9cf0
|
preparation for the optimization of composite and rasterization
(1) create uiPicture and uiDrawCmds
|
5 年前 |
|
GitHub
|
b80fe0ac
|
Merge pull request #227 from UnityTech/focus
fix sample error
|
5 年前 |
|
xingwei.zhu
|
401a5864
|
cache uipath for reuse
|
5 年前 |
|
xingwei.zhu
|
3c2b3a5f
|
fix a minor memory leak in mesh_generator
try to keep the object pool as small as possible
|
5 年前 |
|
xingwei.zhu
|
e8375480
|
longpressup support
|
5 年前 |
|
Yuncong Zhang
|
96a4830a
|
Optimize memory alloc of layout, and fix some warnings.
|
5 年前 |
|
xingwei.zhu
|
b8e35174
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into allocator2
# Conflicts:
# Runtime/ui/painting/canvas_impl.cs
# Runtime/ui/painting/txt/mesh_generator.cs
# Runtime/ui/renderer/compositeCanvas/flow/physical_shape_layer.cs
|
5 年前 |
|
GitHub
|
fbc7ffaa
|
Merge pull request #246 from UnityTech/longpressup
Longpressup
|
5 年前 |
|
GitHub
|
c0f47057
|
Merge pull request #247 from UnityTech/allocator2
GC optimization on renderer
|
5 年前 |
|
xingwei.zhu
|
61a56230
|
fast shadow
|
5 年前 |
iizzaya
|
49970938
|
[Sample] Add a Drag and Drop Sample
|
5 年前 |
|
iizzaya
|
fd2c107b
|
[Sample] Update Drag&Drop Samples
|
5 年前 |
|
iizzaya
|
7d730bce
|
[Sample] Fix bugs & Add annotations
|
5 年前 |
|
GitHub
|
8664527c
|
Merge pull request #253 from IIzzaya/drag_and_drop
[Feature] Add Drag and Drop feature between UnityObject and UIWidgets
|
5 年前 |
|
iizzaya
|
3995d53f
|
[Fix] Isolate the D&D EditorWindow Sample
|
5 年前 |
|
iizzaya
|
e14c95f2
|
[Fix] Change .asmdef file name
|
5 年前 |
|
GitHub
|
5fcd20ae
|
Merge pull request #258 from IIzzaya/drag_and_drop
[Fix] Isolate the D&D EditorWindow Sample
|
5 年前 |
|
xingwei.zhu
|
7af210c5
|
fix android fit
|
5 年前 |
|
xingwei.zhu
|
13f4fca5
|
remove logs and test cases
|
5 年前 |
|
Yuncong Zhang
|
24117ffd
|
Add AntialiasSVGSample.
|
5 年前 |
|
Yuncong Zhang
|
c5a05438
|
Add strut style (framework part).
|
5 年前 |
|
Yuncong Zhang
|
06160d76
|
[1.5.4] Finish TODOs in gesture_detector and text_selection.
|
5 年前 |
|
GitHub
|
d828a18f
|
Merge pull request #273 from UnityTech/yczhang1.5.4
[To 1.5.4] Finish src/widgets.
|
5 年前 |
|
Yuncong Zhang
|
447d118a
|
Merge branch 'master' into layout
|
5 年前 |
|
Yuncong Zhang
|
eaec41e9
|
Merge branch 'master' into layout
|
5 年前 |
|
Yuncong Zhang
|
780a7282
|
Create TextLayoutSample.
|
5 年前 |
|
Yuncong Zhang
|
daeedb3b
|
Code cleanup.
|
5 年前 |
|
iizzaya
|
ece133b2
|
[Cupertino] Add Cupertino Sample
|
5 年前 |
|
GitHub
|
4532e4a1
|
Merge pull request #261 from UnityTech/layout
Layout
|
5 年前 |
|
GitHub
|
89e2bd6a
|
Merge pull request #279 from IIzzaya/cupertino
Cupertino
|
5 年前 |
|
Yuncong Zhang
|
61bdc1b5
|
Merge branch 'cupertino' of github.com:UnityTech/UIWidgets into yczhang1.5.4
|
5 年前 |
|
GitHub
|
2c3f1026
|
Merge pull request #262 from UnityTech/antialias
Antialias
|
5 年前 |
|
Yuncong Zhang
|
0b6b7511
|
[Cupertino] Implement nav_bar.
|
5 年前 |
|
Yuncong Zhang
|
5a85697c
|
[Cupertino] Fix some accidental changes in samples.
|
5 年前 |
|
xingwei.zhu
|
57b9eec6
|
Merge branch 'optmize_shadow' of github.com:UnityTech/UIWidgets into dev
# Conflicts:
# Runtime/ui/painting/path.cs
# Runtime/ui/renderer/cmdbufferCanvas/rendering/canvas_impl.cs
# Runtime/ui/renderer/cmdbufferCanvas/rendering/canvas_shader.cs
|
5 年前 |
|
xingwei.zhu
|
0b055504
|
Merge branch 'dev' of https://github.com/UnityTech/UIWidgets
|
5 年前 |
|
GitHub
|
71b63712
|
Merge pull request #266 from UnityTech/dev
Dev
|
5 年前 |
|
iizzaya
|
653f437c
|
[Cupertino] Fix bugs & Update Gallery.
|
5 年前 |
|
iizzaya
|
82b6fc9b
|
[Cupertino] Update Cupertino gallery
|
5 年前 |
|
Yuncong
|
4405d7ac
|
Merge branch 'master' into hook1.5.4
|
5 年前 |
|
GitHub
|
30fb2bc5
|
Merge pull request #284 from IIzzaya/cupertino
[Cupertino] Update Cupertino gallery
|
5 年前 |
|
GitHub
|
2afb2e0c
|
Merge pull request #287 from UnityTech/cupertino
Cupertino
|
5 年前 |
|
Yuncong
|
17e5c5fa
|
Merge branch 'hook1.5.4' of https://github.com/UnityTech/UIWidgets into hook1.5.4
|
5 年前 |
|
xingwei.zhu
|
df755b20
|
fix cupertino button warning
|
5 年前 |
|
iizzaya
|
288df053
|
[Cupertino] Add Action Sheet & Dialog
|
5 年前 |
|
iizzaya
|
281ff888
|
[Cupertino] Add unfinished Navigation gallery demo.
|
5 年前 |
|
iizzaya
|
65b1356c
|
[Cupertino] Annotate bug demo
|
5 年前 |
|
iizzaya
|
01b02f52
|
[Cupertino] Fix bugs.
|
5 年前 |
|
GitHub
|
27816802
|
Merge pull request #291 from IIzzaya/hook1.5.4
Hook 1.5.4 Cupertino
|
5 年前 |
|
GitHub
|
b3e5905c
|
Merge pull request #289 from UnityTech/hook1.5.4
Hook1.5.4
|
5 年前 |
|
Yuncong Zhang
|
228f741d
|
Cleanup warnings.
|
5 年前 |
|
GitHub
|
f7ed7510
|
Merge pull request #293 from UnityTech/clean_warning
Clean warnings.
|
5 年前 |
|
iizzaya
|
8486553f
|
[Cupertino] Navigation Bar
|
5 年前 |
|
iizzaya
|
db6c7275
|
[Cupertino] Fix bug
|
5 年前 |
|
GitHub
|
90fd7536
|
Merge pull request #295 from IIzzaya/cupertinosample
[Cupertino] Navigation Bar
|
5 年前 |
|
iizzaya
|
1384b476
|
[Cupertino] Fix Navigation Demo bugs
|
5 年前 |
|
iizzaya
|
f71e43c4
|
[Cupertino] Fix Navigation Demo BorderRadius
|
5 年前 |
|
GitHub
|
b6482e34
|
Merge pull request #296 from IIzzaya/cupertinosample
[Cupertino] Gallery bug fix
|
5 年前 |
|
iizzaya
|
29ec4fab
|
[Cupertino] Fix Action Sheet
|
5 年前 |
|
GitHub
|
5e86391e
|
Merge pull request #298 from IIzzaya/cupertinosample
[Cupertino] Fix bugs
|
5 年前 |
|
GitHub
|
3e5e1f0c
|
Merge pull request #297 from UnityTech/cupertinosample
Cupertinosample
|
5 年前 |
|
xingwei.zhu
|
21c4a326
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into dev
|
5 年前 |
|
iizzaya
|
c9020f7b
|
[Material] Add Date Picker Gallery Demo
|
5 年前 |
|
GitHub
|
2506dc0d
|
Merge pull request #319 from IIzzaya/cupertino
[Material] Add Date Picker
|
5 年前 |
|
xingwei.zhu
|
71880753
|
Merge branch 'master' of github.com:UnityTech/UIWidgets into dev
|
5 年前 |
|
iizzaya
|
e23b8fac
|
[Cupertino] Add Picker Demo to Gallery
|
5 年前 |
|
GitHub
|
7c0e8d71
|
Merge pull request #336 from IIzzaya/dev
Support List Wheel & Picker Widget
|
5 年前 |
|
xingwei.zhu
|
a417a105
|
Merge branch 'dev' of github.com:UnityTech/UIWidgets into dev
|
5 年前 |
|
GitHub
|
e27405d3
|
Merge pull request #341 from UnityTech/dev
Dev
|
5 年前 |
|
xingwei.zhu
|
8c3bfde6
|
add configs for user to disable some features in their app
usecase: in Editor app, the RasterCache may should be disabled to avoid Engine errors when the RenderTexture is too big
|
5 年前 |
|
GitHub
|
e5e5a8a8
|
Merge pull request #350 from UnityTech/addglobalconfig
Addglobalconfig
|
5 年前 |
|
GitHub
|
18e40cd8
|
Merge pull request #352 from UnityTech/master
update to latest master (merge bug fixes)
|
5 年前 |
