fzhangtj
|
f05de4ec
|
inspector
|
6 年前 |
|
fzhangtj
|
34c66279
|
fix
|
6 年前 |
|
fzhangtj
|
c9db4b3c
|
widget canvas
|
6 年前 |
kg
|
1d3be554
|
merge
|
6 年前 |
|
fzhangtj
|
4136cf74
|
Merge remote-tracking branch 'origin/master' into debugger
# Conflicts:
# Assets/UIWidgets/Tests/EditableTextWiget.cs
# Assets/UIWidgets/Tests/Gestures.cs
# Assets/UIWidgets/Tests/Paragraph.cs
# Assets/UIWidgets/Tests/RenderBoxes.cs
# Assets/UIWidgets/Tests/RenderEditable.cs
# Assets/UIWidgets/Tests/Widgets.cs
# Assets/UIWidgets/editor/editor_window.cs
# Assets/UIWidgets/ui/painting/canvas_impl.cs
# Assets/UIWidgets/ui/window.cs
|
6 年前 |
GitHub
|
b4ec4918
|
Merge pull request #2 from fzhangtj/debugger
UIWidget under canvas
|
6 年前 |
|
fzhangtj
|
cb240799
|
rename namespace
|
6 年前 |
|
kg
|
088540e9
|
image updates.
|
6 年前 |
Fan Zhang
|
13a4a45d
|
Merge branch 'image_updates' into 'master'
image updates.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!2
|
6 年前 |
|
fzhangtj
|
52c16787
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
|
kg
|
ee0e5f98
|
make sure texture/rendertexture/material has hideflags as HideAndDontSave.
|
6 年前 |
|
Fan Zhang
|
13375925
|
Merge branch 'kgdev' into 'master'
make sure texture/rendertexture/material has hideflags as HideAndDontSave.
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!7
|
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
|
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 年前 |
|
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
|
d8e75c4a
|
code style cleanup (add 2 more rules)
|
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 年前 |
|
fzhangtj
|
ee73e282
|
Merge remote-tracking branch 'upstream/master' into text_edit
|
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
|
de1e6859
|
add inspector functions: refresh, toggle debug paint
|
6 年前 |
|
fzhangtj
|
cd5c129a
|
fix
|
6 年前 |
|
fzhangtj
|
e38b52cd
|
inspector fix
|
6 年前 |
|
Shenhua Gu
|
9617af18
|
Merge branch 'master' into 'master'
add inspector functions: refresh, toggle debug paint
See merge request upm-packages/ui-widgets/com.unity.uiwidgets!83
|
6 年前 |
|
xingwei.zhu
|
c2380e8e
|
Merge branch 'master' of gitlab.cds.internal.unity3d.com:upm-packages/ui-widgets/com.unity.uiwidgets into material
|
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 年前 |
|
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 年前 |
|
fzhangtj
|
86476117
|
show hint message in inspector when not in debug mode
|
6 年前 |
|
GitHub
|
203a0017
|
Merge pull request #61 from fzhangtj/text_edit
show hint message in inspector when not in debug mode
|
6 年前 |
|
GitHub
|
a0e4cb7c
|
Merge branch 'master' into translate
|
6 年前 |
|
fzhangtj
|
1a40fc57
|
Merge remote-tracking branch 'upstream/master'
|
6 年前 |
|
Yuncong Zhang
|
632114c7
|
Cleanup Warnings.
|
5 年前 |
|
Yuncong Zhang
|
dd6a9be6
|
Move pragma to lines.
|
5 年前 |
|
Yuncong Zhang
|
38057089
|
Fix warnings.
|
5 年前 |
|
GitHub
|
01f8e36d
|
Merge pull request #201 from UnityTech/yczhang
Cleanup 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 年前 |
Kevin Gu
|
b00d53eb
|
add async and scheduler binding.
|
4 年前 |
siyao
|
6715fa3d
|
Merge branch 'skia' into siyao_skia
|
4 年前 |
|
Kevin Gu
|
52e20ad9
|
remove this.
|
4 年前 |
|
siyao
|
1db60ffd
|
Merge branch 'skia' into siyao/skia/txt
|
4 年前 |
