比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/tag-release_1.5.4
unity-tech-cn:/kgdev
unity-tech-cn:/siyaoH-1.17-PlatformMessage
unity-tech-cn:/dev_k12
unity-tech-cn:/uiwidgets_1.0
unity-tech-cn:/work_around_tal
unity-tech-cn:/zgh-devtools
unity-tech-cn:/zxw-devTools
unity-tech-cn:/siyaoH-1.17-vulkan
unity-tech-cn:/siyaoH-1.17-vulkan2
unity-tech-cn:/zgh-build_scripts
unity-tech-cn:/siyaoH-1.17-android
unity-tech-cn:/siyaoH-1.17-externalTexture
unity-tech-cn:/siyaoH-1.17-debugDraw
unity-tech-cn:/2.0.3
unity-tech-cn:/siyaoH-1.17-rawTouches
unity-tech-cn:/prepare_2.0.6
unity-tech-cn:/fix_shortcuts
unity-tech-cn:/fix_alignment_issue
unity-tech-cn:/wangshuang
unity-tech-cn:/siyaoH-paste
unity-tech-cn:/zxw-fix_build_script
unity-tech-cn:/siyaoH-1.17-fixLottie
unity-tech-cn:/zxw-support_editor_dragdrop
unity-tech-cn:/siyaoH-1.17-fixAndroid
unity-tech-cn:/siyaoH-1.17-HandleEvent
unity-tech-cn:/siyaoH-1.17-combineTouch
unity-tech-cn:/refine_readme
unity-tech-cn:/2.0.4
unity-tech-cn:/2.0.1
unity-tech-cn:/dev-packman
unity-tech-cn:/zxw-fix_text_shadow_issue
unity-tech-cn:/zxw-fix_backdropfilter
unity-tech-cn:/zxw-fix_transform_hover_issue
unity-tech-cn:/zxw-refine_codegen
unity-tech-cn:/zxw-fix_material_datepicker_issue
unity-tech-cn:/zxw-fix_material_text_direction
unity-tech-cn:/zxw-fix_path_metric_crash
unity-tech-cn:/demo
unity-tech-cn:/jiacheng-demo_proctice
unity-tech-cn:/zxw-3d
unity-tech-cn:/zxw-fix_crash
unity-tech-cn:/zxw-fix_input_issue
unity-tech-cn:/zxw-3d_android
unity-tech-cn:/main/LAO
拉取从: unity-tech-cn:uiwidgets_1.0
unity-tech-cn:/main
unity-tech-cn:/tag-release_1.5.4
unity-tech-cn:/kgdev
unity-tech-cn:/siyaoH-1.17-PlatformMessage
unity-tech-cn:/dev_k12
unity-tech-cn:/uiwidgets_1.0
unity-tech-cn:/work_around_tal
unity-tech-cn:/zgh-devtools
unity-tech-cn:/zxw-devTools
unity-tech-cn:/siyaoH-1.17-vulkan
unity-tech-cn:/siyaoH-1.17-vulkan2
unity-tech-cn:/zgh-build_scripts
unity-tech-cn:/siyaoH-1.17-android
unity-tech-cn:/siyaoH-1.17-externalTexture
unity-tech-cn:/siyaoH-1.17-debugDraw
unity-tech-cn:/2.0.3
unity-tech-cn:/siyaoH-1.17-rawTouches
unity-tech-cn:/prepare_2.0.6
unity-tech-cn:/fix_shortcuts
unity-tech-cn:/fix_alignment_issue
unity-tech-cn:/wangshuang
unity-tech-cn:/siyaoH-paste
unity-tech-cn:/zxw-fix_build_script
unity-tech-cn:/siyaoH-1.17-fixLottie
unity-tech-cn:/zxw-support_editor_dragdrop
unity-tech-cn:/siyaoH-1.17-fixAndroid
unity-tech-cn:/siyaoH-1.17-HandleEvent
unity-tech-cn:/siyaoH-1.17-combineTouch
unity-tech-cn:/refine_readme
unity-tech-cn:/2.0.4
unity-tech-cn:/2.0.1
unity-tech-cn:/dev-packman
unity-tech-cn:/zxw-fix_text_shadow_issue
unity-tech-cn:/zxw-fix_backdropfilter
unity-tech-cn:/zxw-fix_transform_hover_issue
unity-tech-cn:/zxw-refine_codegen
unity-tech-cn:/zxw-fix_material_datepicker_issue
unity-tech-cn:/zxw-fix_material_text_direction
unity-tech-cn:/zxw-fix_path_metric_crash
unity-tech-cn:/demo
unity-tech-cn:/jiacheng-demo_proctice
unity-tech-cn:/zxw-3d
unity-tech-cn:/zxw-fix_crash
unity-tech-cn:/zxw-fix_input_issue
unity-tech-cn:/zxw-3d_android
unity-tech-cn:/main/LAO
此合并请求有变更与目标分支冲突。
/com.unity.uiwidgets/Runtime/redux/widget_redux.cs
/com.unity.uiwidgets/Runtime/painting/decoration_image.cs
/com.unity.uiwidgets/Runtime/rendering/binding.cs
/com.unity.uiwidgets/Runtime/widgets/binding.cs
/com.unity.uiwidgets/Runtime/gestures/converter.cs
/com.unity.uiwidgets/Runtime/Resources/shaders/UIWidgets_GUITexture.shader
/com.unity.uiwidgets/Runtime/editor/surface.cs
/com.unity.uiwidgets/Runtime/editor/editor_mouse_tracking.cs
/com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
/com.unity.uiwidgets/Runtime/editor/editor_window.cs
/com.unity.uiwidgets/Runtime/gestures/mouse_tracking.cs
8 次代码提交
main
...
uiwidgets_1.0
作者 | SHA1 | 备注 | 提交日期 |
---|---|---|---|
xingweizhu | 0c4b655c |
fix mouse tracking issue
cherry-pick from tal project |
3 年前 |
GitHub | 1fb3b0b3 |
Merge pull request #165 from Unity-Technologies/issue_1.0/editor_window_color_issue
fix editor drag issue |
3 年前 |
xingweizhu | c27052f6 | fix editor drag issue | 3 年前 |
GitHub | 2053373e |
Merge pull request #161 from Unity-Technologies/issue_1.0/editor_window_color_issue
fix color issue |
3 年前 |
xingweizhu | 360637a2 |
fix color issue
when playersettings.colorspace is linear, the editor window color is wrong (still srgb). we should add logics to shader to fix this issue |
3 年前 |
xingweizhu | ebaeb7c1 |
temporary fix redux issue
we need to add a host to redux widget to support multi-panel interaction. but currently the code is buggy since it only support editorwindow and will break on standalone players. we should fix this in a later PR |
3 年前 |
GitHub | 66e86b01 |
Merge pull request #142 from Unity-Technologies/zxw/dev_k12
Zxw/dev k12 |
3 年前 |
siyao | 08295573 | fix 0x0 image | 3 年前 |
共有 11 个文件被更改,包括 98 次插入 和 11 次删除
-
11com.unity.uiwidgets/Runtime/Resources/shaders/UIWidgets_GUITexture.shader
-
19com.unity.uiwidgets/Runtime/redux/widget_redux.cs
-
7com.unity.uiwidgets/Runtime/editor/surface.cs
-
9com.unity.uiwidgets/Runtime/editor/editor_mouse_tracking.cs
-
20com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
-
13com.unity.uiwidgets/Runtime/editor/editor_window.cs
-
6com.unity.uiwidgets/Runtime/painting/decoration_image.cs
-
4com.unity.uiwidgets/Runtime/rendering/binding.cs
-
6com.unity.uiwidgets/Runtime/widgets/binding.cs
-
4com.unity.uiwidgets/Runtime/gestures/converter.cs
-
10com.unity.uiwidgets/Runtime/gestures/mouse_tracking.cs
撰写
预览
正在加载...
取消
保存
Reference in new issue