From d8981aa50f6109df5c4973ad4e40bf1d587c58aa Mon Sep 17 00:00:00 2001 From: Unity Technologies <@unity> Date: Tue, 13 Jul 2021 00:00:00 +0000 Subject: [PATCH] com.unity.collab-proxy@1.9.0 ## [1.9.0] - 2021-07-13 Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started! If you have previously used the Unity Asset Store Plastic SCM plug-in, you can now simply use this package. Make sure you delete the plug-in from your project. Removing a previously added Plastic SCM Asset Store Plug-In: - Select the PlasticSCM folder in the Assets\Plugins folder on the Project tab, then click Edit > Delete - Close the Unity Editor and open your project again. You will find the Plastic SCM menu item in the Window menu. ### Added - Added Checkin and Update confirmation notification - Added auto sign in when logged into Unity account ### Changed - Simplified UI: decluttered UI - Improved load time performance ### Fixed - Fixed view not switching to workspace after creating an Enterprise Gluon workspace - Fixed contextual menu not showing up in project view - Fixed SSO renew token after password change - Fixed some namespace collisions with Antlr3 --- CHANGELOG.md | 22 +++ Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs | 19 ++- .../AssetMenu/AssetMenuOperations.cs | 2 +- .../PlasticSCM/AssetMenu/AssetOperations.cs | 12 +- .../AssetOverlays/Cache/LocalStatusCache.cs | 2 +- .../Assets/Images/iconemptygravatar.png | Bin 685 -> 3465 bytes .../Assets/Images/iconemptygravatar.png.meta | 64 ++++++++- .../Assets/Images/iconemptygravatar@2x.png | Bin 1473 -> 0 bytes .../Images/iconemptygravatar@2x.png.meta | 88 ------------ .../Layouts/CreateOrganizationPanel.uxml | 44 +++--- .../Assets/Layouts/SignInWithEmailPanel.uxml | 18 +-- .../Assets/Styles/CreateOrganizationPanel.uss | 27 +--- .../PlasticSCM/Assets/Styles/SignInSignUp.uss | 4 + .../Assets/Styles/SignInWithEmailPanel.uss | 4 - Editor/PlasticSCM/AssetsUtils/AssetsPath.cs | 2 +- .../Processor/PlasticAssetsProcessor.cs | 2 +- .../DownloadRepositoryOperation.cs | 10 +- .../CloudEdition/Welcome/AutoLogin.cs | 105 +++++++++----- .../Welcome/CloudEditionWelcomeWindow.cs | 23 +++- .../CloudEdition/Welcome/OrganizationPanel.cs | 2 + .../Welcome/SignInWithEmailPanel.cs | 5 + .../Configuration/SSOCredentialsDialog.cs | 5 + .../Inspector/DrawInspectorOperations.cs | 3 +- Editor/PlasticSCM/PlasticWindow.cs | 81 ++++++++--- Editor/PlasticSCM/Tool/LaunchTool.cs | 8 +- Editor/PlasticSCM/UI/DrawActionButton.cs | 24 +++- Editor/PlasticSCM/UI/DrawUserIcon.cs | 35 +++++ Editor/PlasticSCM/UI/DrawUserIcon.cs.meta | 11 ++ Editor/PlasticSCM/UI/NotificationDrawer.cs | 68 +++++++++ .../PlasticSCM/UI/NotificationDrawer.cs.meta | 11 ++ .../UI/Tree/GetChangesOverlayIcon.cs | 14 +- Editor/PlasticSCM/UI/UnityConstants.cs | 79 ++++++----- Editor/PlasticSCM/UI/UnityStyles.cs | 6 +- .../PlasticSCM/Unity.PlasticSCM.Editor.asmdef | 4 +- Editor/PlasticSCM/ViewSwitcher.cs | 4 + .../Views/Changesets/ChangesetsListView.cs | 2 +- .../Views/Changesets/ChangesetsTab.cs | 8 +- .../CreateWorkspace/CreateWorkspaceView.cs | 49 +++---- Editor/PlasticSCM/Views/Diff/DiffPanel.cs | 6 +- Editor/PlasticSCM/Views/Diff/DiffTreeView.cs | 2 +- .../Developer/ChangeCategoryTreeViewItem.cs | 6 +- .../Developer/ChangeTreeViewItem.cs | 6 +- .../Developer/IncomingChangesSelection.cs | 9 +- .../Developer/IncomingChangesTab.cs | 56 ++++---- .../Developer/IncomingChangesTreeView.cs | 84 +++++------ .../IncomingChanges/Developer/IsCurrent.cs | 12 +- .../IncomingChanges/Developer/IsResolved.cs | 12 +- .../Developer/UnityIncomingChangesTree.cs | 60 ++++---- .../Dialogs/CheckinMergeNeededDialog.cs | 4 +- .../Dialogs/PendingChangesOptionsDialog.cs | 9 +- .../PendingChanges/DrawCommentTextArea.cs | 40 +++--- .../Views/PendingChanges/PendingChangesTab.cs | 130 ++++++++++++------ .../PendingChangesTab_Operations.cs | 14 +- .../PendingChanges/PendingChangesTreeView.cs | 2 +- .../PlasticSCM/Views/Welcome/WelcomeView.cs | 14 +- .../PlasticSCM/WebApi/CredentialsResponse.cs | 2 +- .../WebApi/PlasticScmRestApiClient.cs | 2 +- .../WebApi/TokenExchangeResponse.cs | 2 +- .../WebApi/UnityPackageBetaEnrollResponse.cs | 2 +- Editor/PlasticSCM/WorkspaceWindow.cs | 114 ++++++++------- .../Unity.Plastic.Antlr3.Runtime.dll | Bin 102400 -> 101376 bytes .../Unity.Plastic.Newtonsoft.Json.dll | Bin 0 -> 565248 bytes .../Unity.Plastic.Newtonsoft.Json.dll.meta | 33 +++++ .../PlasticSCM/localization/guihelp.en.txt | 9 ++ .../PlasticSCM/localization/guihelp.es.txt | 9 ++ .../PlasticSCM/localization/guihelp.ja.txt | 9 ++ .../PlasticSCM/localization/guihelp.ko.txt | 9 ++ .../localization/guihelp.zh-Hans.txt | 9 ++ .../localization/guihelp.zh-Hant.txt | 9 ++ .../localization/plastic-gui.en.txt | 128 ++++++++++------- .../localization/plastic-gui.es.txt | 108 +++++++++------ Lib/Editor/PlasticSCM/unityplastic.dll | Bin 4767744 -> 4760064 bytes Lib/Editor/PlasticSCM/unityplastic.dll.meta | 3 + .../AssetMenu/SelectedAssetGroupInfoTests.cs | 68 ++++----- .../Editor/PlasticSCM/Mock/PlasticApiMock.cs | 4 +- .../Developer/IsCurrentTests.cs | 25 ++-- .../Developer/IsResolvedTests.cs | 40 +++--- .../UnityIncomingChangesTreeTests.cs | 100 +++++++------- ValidationExceptions.json | 4 +- package.json | 9 +- 80 files changed, 1251 insertions(+), 780 deletions(-) delete mode 100644 Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png delete mode 100644 Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta create mode 100644 Editor/PlasticSCM/UI/DrawUserIcon.cs create mode 100644 Editor/PlasticSCM/UI/DrawUserIcon.cs.meta create mode 100644 Editor/PlasticSCM/UI/NotificationDrawer.cs create mode 100644 Editor/PlasticSCM/UI/NotificationDrawer.cs.meta create mode 100644 Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll create mode 100644 Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll.meta diff --git a/CHANGELOG.md b/CHANGELOG.md index 8295849..ba6fc49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,28 @@ 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). +## [1.9.0] - 2021-07-13 + +Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started! +If you have previously used the Unity Asset Store Plastic SCM plug-in, you can now simply use this package. Make sure you delete the plug-in from your project. +Removing a previously added Plastic SCM Asset Store Plug-In: +- Select the PlasticSCM folder in the Assets\Plugins folder on the Project tab, then click Edit > Delete +- Close the Unity Editor and open your project again. You will find the Plastic SCM menu item in the Window menu. + +### Added +- Added Checkin and Update confirmation notification +- Added auto sign in when logged into Unity account + +### Changed +- Simplified UI: decluttered UI +- Improved load time performance + +### Fixed +- Fixed view not switching to workspace after creating an Enterprise Gluon workspace +- Fixed contextual menu not showing up in project view +- Fixed SSO renew token after password change +- Fixed some namespace collisions with Antlr3 + ## [1.7.1] - 2021-06-25 Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started! diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs index c960055..5623823 100644 --- a/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs +++ b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs @@ -6,24 +6,37 @@ using Unity.PlasticSCM.Editor.AssetsOverlays.Cache; using Unity.PlasticSCM.Editor.Inspector; using Unity.PlasticSCM.Editor.UI; +using System.ComponentModel; namespace Unity.PlasticSCM.Editor.AssetMenu { [InitializeOnLoad] internal class AssetMenuItems { - // Adds about 500ms to startup time static AssetMenuItems() + { + BackgroundWorker backgroundWorker = new BackgroundWorker(); + backgroundWorker.DoWork += new DoWorkEventHandler(BackgroundWorker_DoWork); + backgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BackgroundWorker_CompletedWork); + backgroundWorker.RunWorkerAsync(); + } + + static void BackgroundWorker_DoWork(object sender, DoWorkEventArgs e) { PlasticApp.InitializeIfNeeded(); - sPlasticAPI = new PlasticAPI(); + } + static void BackgroundWorker_CompletedWork(object sender, RunWorkerCompletedEventArgs e) + { + sPlasticAPI = new PlasticAPI(); Enable(); } // TODO: do this after calling plastic workspace - static void Enable() + internal static void Enable() { + if (sPlasticAPI==null) sPlasticAPI = new PlasticAPI(); + WorkspaceInfo wkInfo = FindWorkspace.InfoForApplicationPath( Application.dataPath, sPlasticAPI); diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs index 3399d1d..d9f2477 100644 --- a/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs +++ b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs @@ -120,7 +120,7 @@ internal static SelectedAssetGroupInfo BuildFromSingleFile( string assetPath = Path.GetFullPath(path); WorkspaceTreeNode wkTreeNode = - Plastic.API.GetWorkspaceTreeNode(assetPath); + PlasticGui.Plastic.API.GetWorkspaceTreeNode(assetPath); if (isDirectory) isFileSelection = false; diff --git a/Editor/PlasticSCM/AssetMenu/AssetOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs index c1de371..84acd55 100644 --- a/Editor/PlasticSCM/AssetMenu/AssetOperations.cs +++ b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs @@ -63,8 +63,8 @@ internal AssetOperations( mGuiMessage = new UnityPlasticGuiMessage(parentWindow); mProgressControls = new EditorProgressControls(mGuiMessage); - } + } void IAssetMenuOperations.ShowPendingChanges() { mViewSwitcher.ShowPendingChanges(); @@ -199,7 +199,7 @@ void IAssetMenuOperations.ShowDiff() string symbolicName = GetSymbolicName(selectedPath); string extension = Path.GetExtension(selectedPath); - diffInfo = Plastic.API.BuildDiffInfoForDiffWithPrevious( + diffInfo = PlasticGui.Plastic.API.BuildDiffInfoForDiffWithPrevious( selectedPath, symbolicName, selectedPath, extension, mWkInfo); }, /*afterOperationDelegate*/ delegate @@ -229,7 +229,7 @@ void IAssetMenuOperations.ShowHistory() string selectedPath = AssetsSelection.GetSelectedPath( assetList); - WorkspaceTreeNode node = Plastic.API. + WorkspaceTreeNode node = PlasticGui.Plastic.API. GetWorkspaceTreeNode(selectedPath); mHistoryViewLauncher.ShowHistoryView( @@ -241,14 +241,14 @@ void IAssetMenuOperations.ShowHistory() static string GetSymbolicName(string selectedPath) { - WorkspaceTreeNode node = Plastic.API. + WorkspaceTreeNode node = PlasticGui.Plastic.API. GetWorkspaceTreeNode(selectedPath); string branchName = string.Empty; BranchInfoCache.TryGetBranchName( node.RepSpec, node.RevInfo.BranchId, out branchName); - string userName = Plastic.API.GetUserName( + string userName = PlasticGui.Plastic.API.GetUserName( node.RepSpec.Server, node.RevInfo.Owner); string symbolicName = string.Format( @@ -324,4 +324,4 @@ static bool IsApplicableForOperation( } } } -} \ No newline at end of file +} diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs index 6ec3778..bd12100 100644 --- a/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs +++ b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs @@ -50,7 +50,7 @@ static AssetStatus CalculateStatus( if (!IsOnWorkspace(fullPath, wkPath)) return AssetStatus.None; - WorkspaceTreeNode treeNode = Plastic.API.GetWorkspaceTreeNode(fullPath); + WorkspaceTreeNode treeNode = PlasticGui.Plastic.API.GetWorkspaceTreeNode(fullPath); if (CheckWorkspaceTreeNodeStatus.IsPrivate(treeNode)) { diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png index 16a9cdd4a47700330ba408261775e3cac02de809..de72da99d830e4d828169b2b3bc3a76ce232754d 100644 GIT binary patch literal 3465 zcmbVP3piA1A3u~R38ivtO=D78b2WxJYe+LLQ%w;{c&g*f87AgpW?ZIiCGD25VkDca zie)z{r4>d}pFWq;`YcAYmDZGyODJv8w`U|@`#tS``+V~}XU=>1z5n0ue|i7UbB=g# z_B2>vz5oCK1GX1yEBXdCkKR1=|54S3HRx-;*lULr0G6%NJX-9nxDf!*nc({c$O1T< zKv*OoKwMD>LWmWJQ8WNJyT*zkI2@5-LXc3tkbxbps=;FTTn2W#1Bb*BGm$X9*Io(Y zyLYo6yf+-CbFr>280T0JH6TD_5GGa-A(Vo#4D7UB5FKlliCD}uL>A7#x@ib80UU1( zQzSt!Gy(|^lSmYdBb`8|QK>YN9fm@pkccD)BAJ3G(?AjxBs*eeepr-E!sUTmSspW7 z=!}64lgY#&kr)#bLx`~_h$NvzGM!E*k|;z91&<=|Qn^qD#o~oh>-QE|h!mFa#WKD~ zh|yStLPSwA1{PKN&IN&Z)~rxE6DBlZ#8^m7Bojy)m!^SScorv)l0;0Cb73M9fd~+x zOp0R3vsiJMNG6hoiT=d&?DiiB(9m)?vm77QA`r|{NM-KPs2ei@`6ycICl@2ct%y_< zC4mw5XjG=P#v3unlpv5yB=Hl8BHky;`@Ligg-oDe)^H%0FVr|;`@s=}1<4Qw7R?(O zPjbYQXnte|kZKP)P|ztzBE5rhL|i^k{!u6uq|*KXMT>?D$)NuU=E5LPBoRQU%X|S8 ziV(%ZP%LIPkRVeOA(EiPs5<)(*V#;_w?xF_N1z+ht)A;KYB?*MB;$E8Aex)b7nM?!cM2b6%zb)>ylvqi#3 zuOt-lp;e74E^3iZqVnh@h>mw4Il-tZ5*_bk&*R}CdI*mPlR{vsJw;Ra)3pS8@ug^% z)#x=#2hE470&;a?;szae=}!Y)3&ge z&Fc*+bq*{B6sb={YiP=iFMQhX`?qs$98W9kGrDeF;Agn5KJeZgz_?EvXsk@M1MIxw zw8aa$eQO?CiI`TM$1vxkR_i6KC}^`+FpT?tOlL~Y95c^wPVIShzi>S0Mf%iR_QZI^?TKe4#H^HXz{3qf6%s*79ujT;H^5AYI? z0VAP1^>%5ms_WodeGqE}SX#h5w!*HzVNKx*lZSQNt*;n5?l)xJ zTx}(yn<-RJ5#aLmodn_ciXGvRI{*4nL?yBelFZ&qkqd zOcyR$cuowjsDIunc^IDTg9=`y@DzCE=Hxi**Nz6ow7j}$SulEbT|6;k7LJBvPxs|WHT{`txLf^CaO;Q6B5DlC=?UF*K)>$q) zQ;_i@U!@$Fs9I0eOE{>=saCEGKG4W54cd9uVx8B}shpg)D-jBuUhT-j>xMhW4z5Xh zD|Ht?Kde8zxjHo8DRm+{tTMzn{NQEh=9)dDipzFOfSR;lA~`b3llahAS6}7DC%0cR*_hgO^8$8sq7W9QY4rG(??*Wk zb`N=O#*Us#I|E?!62ASp!kWs;F03`!ae3XP3Du!QZ`P#Ir6ukygzm)GDjfZ2Ppr!C zQ)B*jZ8Yx7H(w++m|m|i(&|2Sy_XJ-zb-FoO?&pES=IF|YK0kXjaomKxzaXbfl@!5<-bm>k@@1*R zA0OspDJAAUx^>@}T`jL5c>Q#5Z&ukdRo9l>bGed&x;!Sl-8K!^m}e4PqSG5EsQ=l~ zyfJkxvUV&fvJ6U*A2bNaRP%FtOH`(YiY$*M=|kro@@>2nT$JN=fv*Tvt$jbXRHh~Z%ZW>Yb)!eUZ5`%#bBWbpf)I?543&J}${&PXhH-9GW=Rbfk8BElOj#1TbkM=&TBE-Zqy!%@YcvGvu%!)S`{Mrnc4`rzmOs!>=r(R# zS+wP8k$7Hrdr{F<=~TUs$<&iKnNz%{;;YB0yNL^H zA5NAQs?2dZ*C%$?L@IE}Ay!k}4Aa;2JwBbxJHNeIwGwMsOPcf#zaK@=hc_)h6}2kf zxLf;>bF*iKdHxV!f!`%G(AfbP9>k<2?RheHq+f})2z7hvGI{Q5$n;vxZQK_XJ#Y7W z`i#4l{3fuhcLjFpt-)HCFjpt#eI{t6u+-2I+|%JjHJ*9erFksM z_gt0s@v+WNSsAz!B^e?2jnmX+Px}J1c`5SC!h%O7a~oUZYWCj==t#6-ml~yuF5Ot) zk)_>e4>!3M<@(z^h_q}zSLQ0%e*Wv8y2VYm7Sy7JGG%pVyTUo8Cl*;cs(R|oX&prp ztL7<#UwGuVZD0{$+;=?h`m9)Z;PK~PK1@u{q@(KBe!j~jbBQ)GK@GP_JPeZ_LU7~ zc5>cYerGZF#=nd|xnk0j@foddvixlFg@4o~z82S2xukNk!dBw)cCPY5U+Lo-(>Be=65D+<>%#io3BLoOGL3lv literal 685 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6#=yXs@#Xw?AcrO0(btiIVPik{pF~z5-y$`_ zGtJkRK?}&{U|?*|WMBcZ7=c&{h#44|7BIm@1QswO*dR&qxxpuZN)$X@978MwYlCgO zr4j|^)e0ADad5F+c@)4sQKI>3Xjr)bN0RCu9@u3j;A@UJT00z-{M;A>Z|i~ zrk{?rnky#P-@fd!CU5)Utd${E+Sv{wzb=&iofSIOzp-~y4(r9wKmYL0kvpMl9lP*^ zwOL1sk>>4YVGH9YmK_sP7W@|un(QVKwN~uy_v(|g&VKx3sF&c|u~vf6^~m#-E21R*4w#fpMSR8dBeJ!eevD?H$P_e zht9Uuel0bBz0G3&R;P#hInNCCZ}`W?z@n-u#A#$5uOn6@Yr^|+nv8m)&x5(Fn&jb}I;UDLg#4Zccv^*Rv z$=A;OwaPXq^y@VBk6e>C9Lr!^prrPE*6-?*H+D9z{!u8g+wl6GFaO!U&3a~j(K}=X PD9w1f`njxgN@xNAuPz^E diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta index 0008f45..5190e2b 100644 --- a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta +++ b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: fc4618fe47c3a4a4395e0fa7a839921b +guid: 108d618ffadd71e48af3d64f01fb8f9a TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -32,7 +32,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -100 wrapU: 1 wrapV: 1 @@ -57,8 +57,9 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,17 +70,68 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 6f28ba836400c51469696c80e37bb1da + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png deleted file mode 100644 index 05d66ee248d938a5213e3af5e359c6c02f7da48b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1473 zcmV;y1wQ(TP)E; z3dViOU?4+4K|x>g3z7$6@}NRU9%cx*KmtPIFUX66!brei>qHQvxS$3Cc~Bp0?YJSf zwo6<(=PPd&x9`1U-(hm#-l{rVovJ$L)F~nzdV70M(RJg;gK&F$JGx;_QZNFz@Y~qf z2%}Zd*Vp$GbAASdOUm!>@6*i83~9h(u&}UzE@|oM>6Dd~Ma|940wI(R3=BNEy}ex% z7{jlpr^n^O1mSS_E8un81k1?Ch-ft?zA_W-#>AS!uwQ<#7L39MbcTnA<2E-p|K#p2 z&;1lQfMAf^_o(~7%jNQScX#K)$TPO%5zx{|WuT^cV5A_nwze7-i2mK(T|n#|B&dJGnmY0|3jf;yD zMCt*ZAr9fSJ-?gwt04MRaMnP za&&WZBfLgqKkMr1`bQ~{QvLn?AFz-8&Er&wGqgkO>LR)%&Y}PWJ;r;uTh8AuADJ&d zKmU10N5{XQ8zDjgFXII}k;N^g04oY5CMLeu+1aU%T`9mGu&`G$M`@q%QV_lOr@+F0 zuyDlgvB^|gT1vrSkfx@lEc%j?k`iEvhD|dIH#Rm>d3iax-EQHLGSZD&5HlES`i>iE zBJ)KccmPK-0#Et~VStQacU(qZ(N9T9vEVqsepD&NLNy`Q)-0Kq*oseW6^xIMM~EZ! zn8O(ie5@Xkvy9vb7(Qz}+aiXi&sAb@&#c z(a}*!eugCsVdO*@e8{f#_4ViyJJWBP3=U{^3hV3ZSpQ4#i%mpm!YuZQs5)k6XW^Z= zS43h}v7m=>ps=uz%F4gpgp7 zBb~s~(vofNFv*Gw3aJ1^=7fo88KS~Mf_4J(>U6*>QVDLqsDP`*DV&^~IA!fYCULZ{ zxYuyT(EvQt)6>z|B)!~H8%c^?i?S2|e<&y@5Tzf+*c}vPc6SEo55O);Tpx#>D$XQx zT3VX$c(i6XJ3FI;g9F;x*%74VmjJudj*Ab%OCa1bG+V*HCUDN3%5{5UQ)I|M$tE7YnMWs6ZDNN(ggeZk34i_rdQ- zzo?N>r81)sc-J4UNnC?_dwb$GOpHYVc3?Qw00000NkvXXu0mjf{u-o# diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta deleted file mode 100644 index 399be18..0000000 --- a/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: a553409d46d2f0341a53411e40d9a9a2 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: da68f72147085ca478254e1681a0e8bc - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml index 90a71d1..ad4bfcf 100644 --- a/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml +++ b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml @@ -1,26 +1,28 @@  - -