fzhangtj
|
2e4699a6
|
Merge remote-tracking branch 'origin/master' into text
# Conflicts:
# Assets/UIWidgets/editor/editor_window.cs
# Assets/UIWidgets/rendering/editable.cs
# Assets/UIWidgets/ui/window.cs
# Assets/UIWidgets/widgets/binding.cs
# Assets/UIWidgets/widgets/framework.cs
|
6 年前 |
|
fzhangtj
|
65454de6
|
some fix
|
6 年前 |
|
fzhangtj
|
8de2a7b2
|
text decoration
|
6 年前 |
kg
|
410818cb
|
scroller updates.
|
6 年前 |
gewentao
|
4fd35765
|
merge
|
6 年前 |
|
fzhangtj
|
d51d845b
|
ime composing
|
6 年前 |
|
kg
|
276cdcd8
|
fix promise to be async.
|
6 年前 |
|
fzhangtj
|
639c9f04
|
very basic editable text
|
6 年前 |
|
kg
|
9ad18499
|
scroll updates
|
6 年前 |
|
gewentao
|
8143c534
|
refine image
|
6 年前 |
|
fzhangtj
|
c5507e95
|
Merge remote-tracking branch 'origin/master' into text
|
6 年前 |
|
gewentao
|
45b4da03
|
fix
|
6 年前 |
|
gewentao
|
4f341e4f
|
flex widget
|
6 年前 |
|
kg
|
c7d683d2
|
scroll_view
|
6 年前 |
|
fzhangtj
|
f6a39c1b
|
focus manager
|
6 年前 |
|
kg
|
6995fceb
|
scrollable.
|
6 年前 |
GitHub
|
30d7f0db
|
Merge pull request #11 from UnityTech/image
test image widget with container
|
6 年前 |
|
gewentao
|
f7ded9ab
|
fix
|
6 年前 |
|
gewentao
|
25b32e04
|
test image widget with margin container
|
6 年前 |
|
GitHub
|
7a2e9138
|
Merge pull request #10 from UnityTech/image
update widgets
|
6 年前 |
|
gewentao
|
226de4a4
|
merge
|
6 年前 |
|
gewentao
|
8c27f44a
|
fix
|
6 年前 |
|
kg
|
fe245d5c
|
fix
|
6 年前 |
|
gewentao
|
7d1c51c4
|
merge framework
|
6 年前 |
|
kg
|
d94907d4
|
widgets/framework.
|
6 年前 |
|
kg
|
9c243436
|
widgets
|
6 年前 |
|
GitHub
|
9fc9caad
|
Merge pull request #9 from UnityTech/image
update framework.cs
|
6 年前 |
|
gewentao
|
562e0b71
|
update widgets
|
6 年前 |
|
GitHub
|
a75d1ec6
|
Merge pull request #8 from UnityTech/text
editable render object(text selection part)
|
6 年前 |
|
gewentao
|
079a76fa
|
update widget
|
6 年前 |
|
fzhangtj
|
e85ba77d
|
fix
|
6 年前 |
|
gewentao
|
afe73f64
|
update framework.cs
|
6 年前 |
|
kg
|
731f823d
|
widgets
|
6 年前 |
|
fzhangtj
|
cd624f79
|
Merge remote-tracking branch 'origin/master' into text
|
6 年前 |
|
kg
|
40e4e300
|
Merge remote-tracking branch 'origin/master'
|
6 年前 |
|
GitHub
|
3f8fbfdb
|
Merge pull request #7 from UnityTech/image
widgets init
|
6 年前 |
|
gewentao
|
0d9a85e6
|
fix
|
6 年前 |
|
kg
|
5fc95ffa
|
more animations.
|
6 年前 |
|
gewentao
|
5cbbdf04
|
widgets init
|
6 年前 |
|
kg
|
c845b230
|
animation.
|
6 年前 |
|
gewentao
|
120d9e31
|
Merge remote-tracking branch 'origin/master' into image
|
6 年前 |
|
fzhangtj
|
1516f165
|
editable render object
|
6 年前 |
|
kg
|
f5815db1
|
Merge remote-tracking branch 'origin/master'
|
6 年前 |
|
GitHub
|
8ae57447
|
Merge pull request #6 from UnityTech/text
move mesh generate logic into canvas
|
6 年前 |
|
kg
|
a0609a63
|
physics.
|
6 年前 |
|
gewentao
|
873f85c2
|
Merge remote-tracking branch 'origin/master' into image
|
6 年前 |
|
kg
|
ba624d83
|
update bindings.
|
6 年前 |
|
kg
|
a7e98257
|
gestures
|
6 年前 |
|
kg
|
993df6f1
|
gestures
|
6 年前 |
|
kg
|
46387278
|
gestures
|
6 年前 |
