fzhangtj
|
d384d3a2
|
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 年前 |
|
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 年前 |
|
fzhangtj
|
03761320
|
todo app canvas
|
6 年前 |
|
fzhangtj
|
ab45a021
|
handle mouse event
|
6 年前 |
|
fzhangtj
|
91d6b81d
|
update
|
6 年前 |
kg
|
1d3be554
|
merge
|
6 年前 |
|
fzhangtj
|
c9db4b3c
|
widget canvas
|
6 年前 |
|
kg
|
c254afde
|
merge
|
6 年前 |
GitHub
|
3d9f8fc3
|
Merge pull request #1 from fzhangtj/debugger
inspector & mouse hover
|
6 年前 |
|
fzhangtj
|
34c66279
|
fix
|
6 年前 |
|
fzhangtj
|
cd58f0a7
|
mouse hover
|
6 年前 |
|
fzhangtj
|
6e557f2b
|
periodic timer
|
6 年前 |
|
fzhangtj
|
f05de4ec
|
inspector
|
6 年前 |
|
GitHub
|
21e8df18
|
Merge pull request #27 from UnityTech/text
fix ArgumentOutOfRangeException
|
6 年前 |
|
fzhangtj
|
07eb1703
|
fix ArgumentOutOfRangeException
|
6 年前 |
|
kg
|
4b9239b0
|
update canvas
|
6 年前 |
|
kg
|
5442870e
|
fix pixelsPerPoint.
|
6 年前 |
|
kg
|
697e1434
|
merge text branch.
|
6 年前 |
|
kg
|
c6ad4737
|
add raster cache.
|
6 年前 |
|
fzhangtj
|
040ae059
|
fix text perf issue
|
6 年前 |
|
kg
|
e18956a0
|
Merge remote-tracking branch 'origin/master'
|
6 年前 |
|
GitHub
|
a50f39f3
|
Merge pull request #24 from UnityTech/text
refine text edit
|
6 年前 |
|
fzhangtj
|
ddc15a4c
|
fix
|
6 年前 |
|
fzhangtj
|
433ebb1c
|
refine text edit
|
6 年前 |
|
GitHub
|
433bc977
|
Merge pull request #23 from UnityTech/image
fix
|
6 年前 |
|
kg
|
e77cbe99
|
make widget immutable.
|
6 年前 |
gewentao
|
2456634c
|
fix
|
6 年前 |
|
GitHub
|
755960b0
|
Merge pull request #22 from UnityTech/image
fix image box fit & refine demo page
|
6 年前 |
|
gewentao
|
cd9dc1c3
|
fix image box fit
|
6 年前 |
|
gewentao
|
0cb40d8f
|
update
|
6 年前 |
|
GitHub
|
5b7f62b5
|
Merge pull request #21 from UnityTech/image
as page demo
|
6 年前 |
|
gewentao
|
cf4bf8bb
|
fix
|
6 年前 |
|
gewentao
|
0b86f68a
|
fix
|
6 年前 |
|
gewentao
|
74cafeb1
|
as page demo
|
6 年前 |
|
gewentao
|
8a70a724
|
Merge remote-tracking branch 'origin/master' into image
|
6 年前 |
|
GitHub
|
895748fe
|
Merge pull request #20 from UnityTech/image
stack & aspect ratio
|
6 年前 |
|
kg
|
a8df55e6
|
updates to SceneView Tests.
|
6 年前 |
|
GitHub
|
54556604
|
Merge pull request #19 from UnityTech/text
fix
|
6 年前 |
|
fzhangtj
|
91d17ab8
|
fix
|
6 年前 |
|
GitHub
|
28333fbb
|
Merge pull request #18 from UnityTech/text
Text
|
6 年前 |
|
fzhangtj
|
e20c8628
|
fix text in scene view
|
6 年前 |
|
kg
|
0da363ff
|
Merge remote-tracking branch 'origin/master'
|
6 年前 |
|
gewentao
|
302f634c
|
as
|
6 年前 |
|
fzhangtj
|
5ebbfcca
|
Merge remote-tracking branch 'origin/master' into text
|
6 年前 |
|
GitHub
|
a3b24bdc
|
Merge pull request #17 from UnityTech/text
fix font destroyed issue
|
6 年前 |
|
kg
|
7aa75349
|
fix canvas in sceneview.
|
6 年前 |
|
gewentao
|
74a83ae9
|
remove log
|
6 年前 |
|
fzhangtj
|
392445f7
|
more keyboard edit function
|
6 年前 |
|
kg
|
18998b40
|
test in scene view.
|
6 年前 |
|
gewentao
|
51fab5e2
|
fix
|
6 年前 |
