[ritchie] Preparing for merge...

Assets/Plugins/ThisOtherThing/UI Shapes Kit/Editor/ThisOtherThing.UIShapesKit.Editor.asmdef

@@ -1,9 +1,12 @@
 {
     "name": "ThisOtherThing.UIShapesKit.Editor",
+    "rootNamespace": "",
     "references": [
         "GUID:0b74d47bdee30c04aa2184f2c3e27973"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,

Assets/Plugins/ThisOtherThing/UI Shapes Kit/Scripts/Utils/Animation/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b45e22a4fae4943f08792d0207e4f731
-folderAsset: yes
-timeCreated: 1498587762
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/ThisOtherThing/UI Shapes Kit/Scripts/Utils/Attributes/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 26246c145b7224dbb8e5e37e583053fd
-folderAsset: yes
-timeCreated: 1484492510
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Accessibility/ScreenReaderBootstrap.cs

@@ -1,7 +1,6 @@
 #nullable enable
 
 using System;
-using Codice.Client.BaseCommands.Differences;
 using UnityEngine;
 using UnityExtensions;
 

Assets/Scripts/GamePlatform/GameManager.cs

@@ -13,7 +13,6 @@ using Core.WorldData.Data;
 using Cysharp.Threading.Tasks;
 using GamePlatform.ContentManagement;
 using GameplaySystems.Social;
-using log4net.ObjectRenderer;
 using Modding;
 using Modules;
 using OS;

Assets/Scripts/GameplaySystems/Social/SocialService.cs

@@ -2,10 +2,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Core;
 using Core.WorldData.Data;
-using PlasticPipe.PlasticProtocol.Messages;
 using Player;
 using Social;
 using UnityEngine;

Assets/Scripts/GameplaySystems/Social/UserGuildList.cs

@@ -5,9 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Core;
 using Core.WorldData.Data;
-using PlasticGui;
 using Social;
-using Steamworks.Ugc;
 using UniRx;
 
 namespace GameplaySystems.Social

Assets/Scripts/GameplaySystems/WebPages/WebSite.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using AcidicGui.Mvc;
-using Codice.CM.WorkspaceServer.Tree;
 using UniRx;
 using UnityExtensions;
 

Assets/Scripts/Modding/ModuleManager.cs

@@ -11,7 +11,6 @@ using Core;
 using Core.Config;
 using GamePlatform;
 using Modules;
-using PlasticGui;
 using UnityEngine;
 using UniRx;
 

Assets/Scripts/UI/Applications/Chat/ChatApplicationController.cs

@@ -6,9 +6,7 @@ using System.Linq;
 using AcidicGui.Widgets;
 using Core;
 using Core.WorldData.Data;
-using GameplaySystems.Networld;
 using GameplaySystems.Social;
-using PlasticPipe.PlasticProtocol.Messages;
 using Social;
 using TMPro;
 using UI.Widgets;

Assets/Scripts/UI/Applications/TextEditor/TextEditor.cs

@@ -11,7 +11,6 @@ using Shell.Windowing;
 using TMPro;
 using UI.UiHelpers;
 using UI.Widgets;
-using UnityEditor.PackageManager.UI;
 using UnityEngine;
 using UnityExtensions;
 using UnityEngine.UI;

Assets/Scripts/UI/Controllers/InfoBoxController.cs

@@ -137,6 +137,7 @@ namespace UI.Controllers
 			}
 		}
 		
+		#if UNITY_EDITOR
 		/// <inheritdoc />
 		protected override void OnValidate()
 		{
@@ -150,6 +151,7 @@ namespace UI.Controllers
 
 			UpdateColors();
 		}
+		#endif
 
 		/// <inheritdoc />
 		public IEnumerator<ButtonDefinition> GetEnumerator()

Assets/Scripts/UI/Websites/SocialMedia/SocialTimelineWebPage.cs

@@ -4,10 +4,8 @@ using AcidicGui.Widgets;
 using GameplaySystems.Social;
 using GameplaySystems.WebPages;
 using Social;
-using UI.SystemSettings;
 using UI.Widgets;
 using UniRx;
-using UnityEditorInternal.VersionControl;
 using UnityEngine;
 using UnityExtensions;
 

Assets/Scripts/UI/Widgets/ButtonBackgroundUpdater.cs

@@ -70,12 +70,14 @@ namespace UI.Widgets
 			button.spriteState = textureSet.spriteState;
 		}
 
+		#if UNITY_EDITOR
 		/// <inheritdoc />
 		protected override void OnValidate()
 		{
 			UpdateBackground();
 			base.OnValidate();
 		}
+		#endif
 
 		public enum ButtonColor
 		{

Assets/Scripts/UI/Widgets/FileChooserWindow.cs

@@ -15,8 +15,6 @@ using Shell.Windowing;
 using TMPro;
 using UI.Applications.FileManager;
 using UI.Shell.Common;
-using UI.Windowing;
-using Unity.Profiling.Editor;
 using UnityEngine;
 using UnityExtensions;
 using UnityEngine.UI;

Assets/Scripts/UI/Windowing/UguiMessageDialog.cs

@@ -5,15 +5,11 @@ using Architecture;
 using Shell;
 using Shell.Common;
 using Shell.Windowing;
-using TMPro;
 using TrixelCreative.TrixelAudio;
 using TrixelCreative.TrixelAudio.Data;
 using UI.Controllers;
-using UI.Widgets;
-using UnityEditor.PackageManager.UI;
 using UnityEngine;
 using UnityExtensions;
-using Utility;
 
 namespace UI.Windowing
 {

Assets/Scripts/UI/Windowing/WindowTab.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Codice.Client.GameUI.Update;
 using ThisOtherThing.UI.Shapes;
 using TMPro;
 using UnityEngine;

Packages/com.sociallydistant.framework/Runtime/Core/Config/SettingsCategory.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using PlasticGui.WorkspaceWindow.Diff;
 
 namespace Core.Config
 {

Packages/dev.acidiclight.gui/Editor/AcidicGui.Editor.asmdef

@@ -4,7 +4,9 @@
     "references": [
         "GUID:be8853a97ae525845a147d5ed71e336b"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,

Packages/dev.acidiclight.gui/Runtime/Widgets/WidgetBuilder.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using UnityEditor.Graphs;
 using UnityEngine;
 
 namespace AcidicGui.Widgets

UserSettings/Layouts/default-2021.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 3840
     height: 2056
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Console
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 81
+  controlID: 19
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 82
+  controlID: 20
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 83
+  controlID: 21
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -242,15 +242,15 @@ MonoBehaviour:
     y: 1334
     width: 2932
     height: 672
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
   - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -404,7 +404,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 32fbffff
+      m_ExpandedIDs: eed8ffff2ed9ffff4eddffff34fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -797,7 +797,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: TextEditor
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -807,23 +807,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Packages/dev.acidiclight.gui/Editor
     m_Globs: []
-    m_OriginalText: TextEditor
+    m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets
+  - Packages/dev.acidiclight.gui/Editor
   m_LastFoldersGridSize: -1
   m_LastProjectPath: F:\Projects\Alkaline Thunder\socdist-restitched
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 82710000
-    m_LastClickedID: 29058
-    m_ExpandedIDs: 00000000827100008471000086710000887100008a7100008c71000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1341}
+    m_SelectedIDs: 80770000
+    m_LastClickedID: 30592
+    m_ExpandedIDs: 00000000827100008471000086710000887100008a7100008c710000a47100002a720000c2730000c4730000c6730000c873000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -876,9 +876,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_SelectedInstanceIDs: 40740000
+    m_LastClickedInstanceID: 29760
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000a4610000ae6d0000c26d0000246f000050f5ffff00000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0