diff --git a/.Resources/.collabattributes b/.Resources/.collabattributes index f6125fa..c8cb4a6 100644 --- a/.Resources/.collabattributes +++ b/.Resources/.collabattributes @@ -1,86 +1,86 @@ -* text=auto - -# Unity files -*.meta -text merge=unityyamlmerge diff -*.unity -text merge=unityyamlmerge diff -*.asset -text merge=unityyamlmerge diff -*.prefab -text merge=unityyamlmerge diff -*.mat -text merge=unityyamlmerge diff -*.anim -text merge=unityyamlmerge diff -*.controller -text merge=unityyamlmerge diff -*.overrideController -text merge=unityyamlmerge diff -*.physicMaterial -text merge=unityyamlmerge diff -*.physicsMaterial2D -text merge=unityyamlmerge diff -*.playable -text merge=unityyamlmerge diff -*.mask -text merge=unityyamlmerge diff -*.brush -text merge=unityyamlmerge diff -*.flare -text merge=unityyamlmerge diff -*.fontsettings -text merge=unityyamlmerge diff -*.guiskin -text merge=unityyamlmerge diff -*.giparams -text merge=unityyamlmerge diff -*.renderTexture -text merge=unityyamlmerge diff -*.spriteatlas -text merge=unityyamlmerge diff -*.terrainlayer -text merge=unityyamlmerge diff -*.mixer -text merge=unityyamlmerge diff -*.shadervariants -text merge=unityyamlmerge diff - -# Image formats -*.psd filter=lfs diff=lfs merge=lfs -text -*.jpg filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.tiff filter=lfs diff=lfs merge=lfs -text -*.tif filter=lfs diff=lfs merge=lfs -text -*.iff filter=lfs diff=lfs merge=lfs -text -*.pict filter=lfs diff=lfs merge=lfs -text -*.dds filter=lfs diff=lfs merge=lfs -text -*.xcf filter=lfs diff=lfs merge=lfs -text - -# Audio formats -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.aiff filter=lfs diff=lfs merge=lfs -text -*.aif filter=lfs diff=lfs merge=lfs -text -*.mod filter=lfs diff=lfs merge=lfs -text -*.it filter=lfs diff=lfs merge=lfs -text -*.s3m filter=lfs diff=lfs merge=lfs -text -*.xm filter=lfs diff=lfs merge=lfs -text - -# Video formats -*.mov filter=lfs diff=lfs merge=lfs -text -*.avi filter=lfs diff=lfs merge=lfs -text -*.asf filter=lfs diff=lfs merge=lfs -text -*.mpg filter=lfs diff=lfs merge=lfs -text -*.mpeg filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text - -# 3D formats -*.fbx filter=lfs diff=lfs merge=lfs -text -*.obj filter=lfs diff=lfs merge=lfs -text -*.max filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.dae filter=lfs diff=lfs merge=lfs -text -*.mb filter=lfs diff=lfs merge=lfs -text -*.ma filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.dfx filter=lfs diff=lfs merge=lfs -text -*.c4d filter=lfs diff=lfs merge=lfs -text -*.lwo filter=lfs diff=lfs merge=lfs -text -*.lwo2 filter=lfs diff=lfs merge=lfs -text -*.abc filter=lfs diff=lfs merge=lfs -text -*.3dm filter=lfs diff=lfs merge=lfs -text - -# Build -*.dll filter=lfs diff=lfs merge=lfs -text -*.pdb filter=lfs diff=lfs merge=lfs -text -*.mdb filter=lfs diff=lfs merge=lfs -text - -# Packaging -*.zip filter=lfs diff=lfs merge=lfs -text -*.7z filter=lfs diff=lfs merge=lfs -text -*.gz filter=lfs diff=lfs merge=lfs -text -*.rar filter=lfs diff=lfs merge=lfs -text -*.tar filter=lfs diff=lfs merge=lfs -text +* text=auto + +# Unity files +*.meta -text merge=unityyamlmerge diff +*.unity -text merge=unityyamlmerge diff +*.asset -text merge=unityyamlmerge diff +*.prefab -text merge=unityyamlmerge diff +*.mat -text merge=unityyamlmerge diff +*.anim -text merge=unityyamlmerge diff +*.controller -text merge=unityyamlmerge diff +*.overrideController -text merge=unityyamlmerge diff +*.physicMaterial -text merge=unityyamlmerge diff +*.physicsMaterial2D -text merge=unityyamlmerge diff +*.playable -text merge=unityyamlmerge diff +*.mask -text merge=unityyamlmerge diff +*.brush -text merge=unityyamlmerge diff +*.flare -text merge=unityyamlmerge diff +*.fontsettings -text merge=unityyamlmerge diff +*.guiskin -text merge=unityyamlmerge diff +*.giparams -text merge=unityyamlmerge diff +*.renderTexture -text merge=unityyamlmerge diff +*.spriteatlas -text merge=unityyamlmerge diff +*.terrainlayer -text merge=unityyamlmerge diff +*.mixer -text merge=unityyamlmerge diff +*.shadervariants -text merge=unityyamlmerge diff + +# Image formats +*.psd filter=lfs diff=lfs merge=lfs -text +*.jpg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.bmp filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.tiff filter=lfs diff=lfs merge=lfs -text +*.tif filter=lfs diff=lfs merge=lfs -text +*.iff filter=lfs diff=lfs merge=lfs -text +*.pict filter=lfs diff=lfs merge=lfs -text +*.dds filter=lfs diff=lfs merge=lfs -text +*.xcf filter=lfs diff=lfs merge=lfs -text + +# Audio formats +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.aiff filter=lfs diff=lfs merge=lfs -text +*.aif filter=lfs diff=lfs merge=lfs -text +*.mod filter=lfs diff=lfs merge=lfs -text +*.it filter=lfs diff=lfs merge=lfs -text +*.s3m filter=lfs diff=lfs merge=lfs -text +*.xm filter=lfs diff=lfs merge=lfs -text + +# Video formats +*.mov filter=lfs diff=lfs merge=lfs -text +*.avi filter=lfs diff=lfs merge=lfs -text +*.asf filter=lfs diff=lfs merge=lfs -text +*.mpg filter=lfs diff=lfs merge=lfs -text +*.mpeg filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text + +# 3D formats +*.fbx filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +*.max filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text +*.dae filter=lfs diff=lfs merge=lfs -text +*.mb filter=lfs diff=lfs merge=lfs -text +*.ma filter=lfs diff=lfs merge=lfs -text +*.3ds filter=lfs diff=lfs merge=lfs -text +*.dfx filter=lfs diff=lfs merge=lfs -text +*.c4d filter=lfs diff=lfs merge=lfs -text +*.lwo filter=lfs diff=lfs merge=lfs -text +*.lwo2 filter=lfs diff=lfs merge=lfs -text +*.abc filter=lfs diff=lfs merge=lfs -text +*.3dm filter=lfs diff=lfs merge=lfs -text + +# Build +*.dll filter=lfs diff=lfs merge=lfs -text +*.pdb filter=lfs diff=lfs merge=lfs -text +*.mdb filter=lfs diff=lfs merge=lfs -text + +# Packaging +*.zip filter=lfs diff=lfs merge=lfs -text +*.7z filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.rar filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text diff --git a/.Resources/.collabignore b/.Resources/.collabignore index 4fb1b01..db90be0 100644 --- a/.Resources/.collabignore +++ b/.Resources/.collabignore @@ -1,50 +1,50 @@ -[Ll]ibrary/ -[Tt]emp/ -[Oo]bj/ -[Bb]uild/ -[Bb]uilds/ -[Ll]ogs/ - -# Uncomment this line if you wish to ignore the asset store tools plugin -# [Aa]ssets/AssetStoreTools* - -# Visual Studio cache directory -.vs/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo/Rider/VSCode solution and project files -ExportedObj/ -.consulo/ -.vscode/ -.idea/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties +[Ll]ibrary/ +[Tt]emp/ +[Oo]bj/ +[Bb]uild/ +[Bb]uilds/ +[Ll]ogs/ + +# Uncomment this line if you wish to ignore the asset store tools plugin +# [Aa]ssets/AssetStoreTools* + +# Visual Studio cache directory +.vs/ + +# Gradle cache directory +.gradle/ + +# Autogenerated VS/MD/Consulo/Rider/VSCode solution and project files +ExportedObj/ +.consulo/ +.vscode/ +.idea/ +*.csproj +*.unityproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb +*.mdb +*.opendb +*.VC.db + +# Unity3D generated meta files +*.pidb.meta +*.pdb.meta +*.mdb.meta + +# Unity3D generated file on crash reports +sysinfo.txt + +# Builds +*.apk +*.unitypackage + +# Crashlytics generated file +crashlytics-build.properties diff --git a/CHANGELOG.md b/CHANGELOG.md index cdad48f..ad7a2a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,173 +1,182 @@ -# Changelog -All notable changes to this package will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - -## [2.1.0-preview.3] - 2020-02-03 -## Changed -- Revert can now handle new files. -## Fixed -- Bulk revert missing confirmation dialogue. -- Bulk revert errors when reverting new files. - -## [2.1.0-preview.2] - 2020-01-30 -## Changed -- Bulk revert is now supported. -- Collab is blocked in play mode. -## Fixed -- Ignore files behavior is now matched between Collab v1 and v2. -- Ignore icons are now consistent with the ignored state of a file. -- Fixed Collab toolbar button always stating there are changes to publish. -- Fixed services window's links to open Collab. - -## [2.1.0-preview.1] - 2020-01-21 -### Changed -- Update UX to UIElements. -- Increased minimum supported version to 2020.1. -- Updated LibGit2Sharp to v0.26.2. -- Updated serialization to use JSON instead of XML. -### Fixed -- Collab server no longer runs on projects without Collab enabled. -- Ignored changes are now correctly displayed. -- Conflicts list will update as entries are resolved. - -## [2.0.0-preview.17] - 2019-5-28 -### Fixed -- Fixes missing .meta files - -## [2.0.0-preview.16] - 2019-5-28 -### Fixed -- Fixes display issues on the refreshed editor theme in 2019.3 - -## [2.0.0-preview.15] - 2019-5-17 -### Changed -- Block user from triggering scan while publishing -### Fixed -- Bug fixes for first-time user experience -- Bug fixes to ensure server errors/responses are provided to the editor/user -- Bug fixes to ensure server logs correctly - -## [2.0.0-preview.14] - 2019-5-10 -### Fixed -- Bug fixes to reduce proxy server polling -- Bug fixes to rotate proxy server logs - -## [2.0.0-preview.13] - 2019-5-10 -### Fixed -- Bug fixes to update status of subsets of files - -## [2.0.0-preview.12] - 2019-4-30 -### Fixed -- Bug fixes to stop collab getting stuck in looking for changes. -- Bug fixes to stop "Unknown operation error" on collab init. -- Bug fices to stop error on publishing when a file has been deleted. - -## [2.0.0-preview.11] - 2019-4-24 -- Remove automatic get changes when domain reload occurs. - -## [2.0.0-preview.10] - 2019-4-23 -### Changed -- Update to LibGit2Sharp 0.26.0. -- Move to https. -### Fixed -- Ensure default .collabignore rules are used. - -## [2.0.0-preview.9] - 2019-4-19 -### Removed -- Remove automatic identification of changes - -## [2.0.0-preview.8] - 2019-4-8 -### Fixed -- Performance fixes to reduce CPU load. - -## [2.0.0-preview.6] - 2019-3-23 -### Fixed -- Bug fixes to serialization when using legacy scripting runtime. -- Bug fixes to remove migration dialog that should be forced. -- Performance improvements to reduce polling frequency and unnecessary file hashes. -### Removed -- Removed dependency on third-party moq.dll - -## [2.0.0-preview.4] - 2018-12-17 -### Changed -- Serialization updates to change serialization from JSON to XML. - -## [2.0.0-preview.3] - 2018-12-14 -### Fixed -- Further bugfixes related to updating the state of the Git repository asynchronously. - -## [2.0.0-preview.2] - 2018-09-28 -### Fixed -- Bugfixes related to updating the state of the Git repository asynchronously. - -## [2.0.0-preview.1] - 2018-09-20 -### Changed -- Switched from snapshot system to Git repository, addressing stability issues. - -## [1.3.7] - 2020-01-30 -## Changed -- Bulk revert is now supported. -- Collab is blocked in play mode. -## Fixed -- Fixed services window's links to open Collab. - -## [1.3.6] - 2020-01-21 -### Fixed -- Fixed compile errors when removing the NUnit package by removing unnecessary references. - -## [1.3.5] - 2020-01-08 -### Fixed -- Fix "accept mine" / "accept remote" icon swap in conflicts view. - -## [1.3.4] - 2019-12-16 -### Changed -- Window state is no longer restored after the window is closed and opened. -### Fixed -- History tab failing to load on startup if it is left open in the previous session. -- Progress bar percentage not matching the bar. -- History list correctly updates after a new revision is published. -- UI instabilities when restoring or going back to a revision with a different package manifest. -- Improve handling of changes to the project id. - -## [1.3.3] - 2019-12-10 -### Changed -- Disable UI test cases that can be unstable. - -## [1.3.2] - 2019-12-05 -### Changed -- Update UX to UIElements. -- Increased minimum supported version to 2020.1. -- Update Documentation to required standards. - -## [1.2.16] - 2019-02-11 -### Fixed -- Update stylesheet to pass USS validation - -## [1.2.15] - 2018-11-16 -### Changed -- Added support for non-experimental UIElements. - -## [1.2.11] - 2018-09-04 -### Fixed -- Made some performance improvements to reduce impact on ReloadAssemblies. - -## [1.2.9] - 2018-08-13 -### Fixed -- Test issues for the Collab History Window are now fixed. - -## [1.2.7] - 2018-08-07 -### Fixed -- Toolbar drop-down will no longer show up when package is uninstalled. - -## [1.2.6] - 2018-06-15 -### Fixed -- Fixed an issue where Collab's History window wouldn't load properly. - -## [1.2.5] - 2018-05-21 -This is the first release of *Unity Package CollabProxy*. - -### Added -- Collab history and toolbar windows -- Collab view and presenter classes -- Collab Editor tests for view and presenter +# Changelog +All notable changes to this package will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [2.1.0-preview.5] - 2020-06-09 +## Fixed +- Fix error when partially publishing without the window open + +## [2.1.0-preview.4] - 2020-04-03 +## Fixed +- Fixed bug with process info not updating properly after canceled publish +- Fixed bug with error message when refreshing changes + +## [2.1.0-preview.3] - 2020-02-03 +## Changed +- Revert can now handle new files. +## Fixed +- Bulk revert missing confirmation dialogue. +- Bulk revert errors when reverting new files. + +## [2.1.0-preview.2] - 2020-01-30 +## Changed +- Bulk revert is now supported. +- Collab is blocked in play mode. +## Fixed +- Ignore files behavior is now matched between Collab v1 and v2. +- Ignore icons are now consistent with the ignored state of a file. +- Fixed Collab toolbar button always stating there are changes to publish. +- Fixed services window's links to open Collab. + +## [2.1.0-preview.1] - 2020-01-21 +### Changed +- Update UX to UIElements. +- Increased minimum supported version to 2020.1. +- Updated LibGit2Sharp to v0.26.2. +- Updated serialization to use JSON instead of XML. +### Fixed +- Collab server no longer runs on projects without Collab enabled. +- Ignored changes are now correctly displayed. +- Conflicts list will update as entries are resolved. + +## [2.0.0-preview.17] - 2019-05-28 +### Fixed +- Fixes missing .meta files + +## [2.0.0-preview.16] - 2019-05-28 +### Fixed +- Fixes display issues on the refreshed editor theme in 2019.3 + +## [2.0.0-preview.15] - 2019-05-17 +### Changed +- Block user from triggering scan while publishing +### Fixed +- Bug fixes for first-time user experience +- Bug fixes to ensure server errors/responses are provided to the editor/user +- Bug fixes to ensure server logs correctly + +## [2.0.0-preview.14] - 2019-05-10 +### Fixed +- Bug fixes to reduce proxy server polling +- Bug fixes to rotate proxy server logs + +## [2.0.0-preview.13] - 2019-05-10 +### Fixed +- Bug fixes to update status of subsets of files + +## [2.0.0-preview.12] - 2019-04-30 +### Fixed +- Bug fixes to stop collab getting stuck in looking for changes. +- Bug fixes to stop "Unknown operation error" on collab init. +- Bug fices to stop error on publishing when a file has been deleted. + +## [2.0.0-preview.11] - 2019-04-24 +- Remove automatic get changes when domain reload occurs. + +## [2.0.0-preview.10] - 2019-04-23 +### Changed +- Update to LibGit2Sharp 0.26.0. +- Move to https. +### Fixed +- Ensure default .collabignore rules are used. + +## [2.0.0-preview.9] - 2019-04-19 +### Removed +- Remove automatic identification of changes + +## [2.0.0-preview.8] - 2019-04-08 +### Fixed +- Performance fixes to reduce CPU load. + +## [2.0.0-preview.6] - 2019-03-23 +### Fixed +- Bug fixes to serialization when using legacy scripting runtime. +- Bug fixes to remove migration dialog that should be forced. +- Performance improvements to reduce polling frequency and unnecessary file hashes. +### Removed +- Removed dependency on third-party moq.dll + +## [2.0.0-preview.4] - 2018-12-17 +### Changed +- Serialization updates to change serialization from JSON to XML. + +## [2.0.0-preview.3] - 2018-12-14 +### Fixed +- Further bugfixes related to updating the state of the Git repository asynchronously. + +## [2.0.0-preview.2] - 2018-09-28 +### Fixed +- Bugfixes related to updating the state of the Git repository asynchronously. + +## [2.0.0-preview.1] - 2018-09-20 +### Changed +- Switched from snapshot system to Git repository, addressing stability issues. + +## [1.3.7] - 2020-01-30 +## Changed +- Bulk revert is now supported. +- Collab is blocked in play mode. +## Fixed +- Fixed services window's links to open Collab. + +## [1.3.6] - 2020-01-21 +### Fixed +- Fixed compile errors when removing the NUnit package by removing unnecessary references. + +## [1.3.5] - 2020-01-08 +### Fixed +- Fix "accept mine" / "accept remote" icon swap in conflicts view. + +## [1.3.4] - 2019-12-16 +### Changed +- Window state is no longer restored after the window is closed and opened. +### Fixed +- History tab failing to load on startup if it is left open in the previous session. +- Progress bar percentage not matching the bar. +- History list correctly updates after a new revision is published. +- UI instabilities when restoring or going back to a revision with a different package manifest. +- Improve handling of changes to the project id. + +## [1.3.3] - 2019-12-10 +### Changed +- Disable UI test cases that can be unstable. + +## [1.3.2] - 2019-12-05 +### Changed +- Update UX to UIElements. +- Increased minimum supported version to 2020.1. +- Update Documentation to required standards. + +## [1.2.16] - 2019-02-11 +### Fixed +- Update stylesheet to pass USS validation + +## [1.2.15] - 2018-11-16 +### Changed +- Added support for non-experimental UIElements. + +## [1.2.11] - 2018-09-04 +### Fixed +- Made some performance improvements to reduce impact on ReloadAssemblies. + +## [1.2.9] - 2018-08-13 +### Fixed +- Test issues for the Collab History Window are now fixed. + +## [1.2.7] - 2018-08-07 +### Fixed +- Toolbar drop-down will no longer show up when package is uninstalled. + +## [1.2.6] - 2018-06-15 +### Fixed +- Fixed an issue where Collab's History window wouldn't load properly. + +## [1.2.5] - 2018-05-21 +This is the first release of *Unity Package CollabProxy*. + +### Added +- Collab history and toolbar windows +- Collab view and presenter classes +- Collab Editor tests for view and presenter diff --git a/Documentation~/unity-cloud-collaborate.md b/Documentation~/unity-cloud-collaborate.md index 76ed223..9584138 100644 --- a/Documentation~/unity-cloud-collaborate.md +++ b/Documentation~/unity-cloud-collaborate.md @@ -1,5 +1,5 @@ -# About Unity Collaborate - -Collaborate is a simple way for teams to save, share, and sync their Unity project. - -Please refer to the online documentation [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html) +# About Unity Collaborate + +Collaborate is a simple way for teams to save, share, and sync their Unity project. + +Please refer to the online documentation [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html) diff --git a/Editor/Assets/Icons/README.md b/Editor/Assets/Icons/README.md index b9c7d62..514ac53 100644 --- a/Editor/Assets/Icons/README.md +++ b/Editor/Assets/Icons/README.md @@ -1,10 +1,10 @@ -# Icons -This directory contains the icons for the Collaborate UI. -Dark and light theme icons are prefixed with `-dark` and `-light` respectively. -HDPI icons are prefixed with `@2x` for 32x32px for two times the width and height of the normal 16x16px. -Individual icon's `Texture Type` should be set as `Editor GUI and Legacy GUI` in the Unity Editor to ensure scaling is done correctly and alpha is respected. - -## Icon colours -The basic colours of icons in Collaborate are as follows:\ -Dark Theme: #C4C4C4 100% alpha\ -Light Theme: #555555 100% alpha +# Icons +This directory contains the icons for the Collaborate UI. +Dark and light theme icons are prefixed with `-dark` and `-light` respectively. +HDPI icons are prefixed with `@2x` for 32x32px for two times the width and height of the normal 16x16px. +Individual icon's `Texture Type` should be set as `Editor GUI and Legacy GUI` in the Unity Editor to ensure scaling is done correctly and alpha is respected. + +## Icon colours +The basic colours of icons in Collaborate are as follows:\ +Dark Theme: #C4C4C4 100% alpha\ +Light Theme: #555555 100% alpha diff --git a/Editor/Assets/Layouts/AlertBox.uxml b/Editor/Assets/Layouts/AlertBox.uxml index bf11eb9..d380872 100644 --- a/Editor/Assets/Layouts/AlertBox.uxml +++ b/Editor/Assets/Layouts/AlertBox.uxml @@ -1,16 +1,16 @@ - - - - - - - - -