Merge branch 'main' into feature/convert-array

Author: Sleitnick

.github/workflows/package-deployment.yaml

@@ -2,9 +2,9 @@ name: Publish Airship Package
 run-name: Publish Airship Package env:${{ inputs.environment || 'platform-staging' }}
 
 on:
-  push:
-    branches:
-      - main
+  # push:
+  #   branches:
+  #     - main
   workflow_dispatch:
     inputs:
       environment:

.github/workflows/trigger-deployments.yaml

@@ -1,15 +1,15 @@
 name: Outbound Trigger Deploy (Fast)
 
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      environment:
-        type: environment
-        default: platform-staging
-        required: true
+# on:
+#   push:
+#     branches:
+#       - main
+#   workflow_dispatch:
+#     inputs:
+#       environment:
+#         type: environment
+#         default: platform-staging
+#         required: true
 
 jobs:
   trigger:

AuthenticationForUnity/Runtime/OAuth2/AuthenticationSession.cs

@@ -50,15 +50,10 @@ public async Task<AccessTokenResponse> AuthenticateAsync(CancellationToken cance
             try
             {
                 // 1. Create authorization request URL.
-                Debug.Log("Making authorization request...");
-
                 var redirectUrl = _client.configuration.redirectUri;
                 var authorizationUrl = _client.GetAuthorizationUrl();
 
                 // 2. Get authorization code grant using login form in the browser.
-                Debug.Log("Getting authorization grant using browser login...");
-
-
                 using var loginCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(
                     cancellationToken, timeoutCancellationTokenSource.Token);
 
@@ -67,11 +62,6 @@ public async Task<AccessTokenResponse> AuthenticateAsync(CancellationToken cance
                 if (browserResult.status == BrowserStatus.Success)
                 {
                     // 3. Exchange authorization code for access and refresh tokens.
-                    Debug.Log("Exchanging authorization code for access and refresh tokens...");
-
-#if UNITY_EDITOR
-                    Debug.Log($"Redirect URL: {browserResult.redirectUrl}");
-#endif
                     return await _client.ExchangeCodeForAccessTokenAsync(browserResult.redirectUrl, cancellationToken);
                 }
 

AuthenticationForUnity/Runtime/OAuth2/AuthorizationCodeFlow.cs

@@ -246,11 +246,6 @@ private async Task<AccessTokenResponse> GetAccessTokenInternalAsync(FormUrlEncod
             tokenRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", base64AuthString);
             tokenRequest.Content = content;
 
-#if UNITY_EDITOR
-            Debug.Log($"{tokenRequest}");
-            Debug.Log($"{await tokenRequest.Content.ReadAsStringAsync()}");
-#endif
-
             var response = await httpClient.SendAsync(tokenRequest, cancellationToken);
             if (response.IsSuccessStatusCode)
             {

Editor/Accessories/AccessoryBuilderEditor.cs

@@ -24,7 +24,7 @@ public override void OnInspectorGUI() {
         if (GUILayout.Button("Equip Referenced Outfit")) {
             if(builder.currentOutfit != null){
                 Debug.Log("Equipping outfit " + builder.currentOutfit.name);
-                builder.EquipAccessoryOutfit(builder.currentOutfit, true);
+                builder.EquipAccessoryOutfit(builder.currentOutfit, true, true);
             }
         }
 
@@ -61,15 +61,15 @@ public override void OnInspectorGUI() {
         }
     }
 
-    private async Task DownloadUserOutfit(AccessoryBuilder builder){
+    private async Task DownloadUserOutfit(AccessoryBuilder builder) {
         Debug.Log("Starting download");
         downloading = true;
         await builder.AddOutfitFromUserId(builder.currentUserId);
         Debug.Log("Done with download");
         downloading = false;
     }
 
-    private async Task DownloadUsernameOutfit(AccessoryBuilder builder){
+    private async Task DownloadUsernameOutfit(AccessoryBuilder builder) {
         Debug.Log("Starting download");
         downloading = true;
         await builder.EquipOutfitFromUsername(builder.currentUserName);

Editor/Accessories/AccessoryCollectionEditorTools.cs

@@ -16,18 +16,20 @@ private static void FillAvatarCollection() {
         string folderPath = Application.dataPath + "/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems";
         string allItemsPath
             = "Assets/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems/EntireAvatarCollection.asset";
-            //
+        
         AvatarAccessoryCollection allAccessories = AssetDatabase.LoadAssetAtPath<AvatarAccessoryCollection>(allItemsPath);
 
         //Compile accessories
         List<AccessoryComponent> accs = new List<AccessoryComponent>();
         int count = 0;
         GetAccessoriesInFolder(ref count, folderPath, "prefab", (relativePath)=>{
                 var go = AssetDatabase.LoadAssetAtPath<GameObject>(relativePath);
-                var acc = go.GetComponent<AccessoryComponent>();
-                if (acc != null) {
-                    //Debug.Log("Found Accessory: " + relativePath);
-                    accs.Add(acc);
+                if(go != null){
+                    var acc = go.GetComponent<AccessoryComponent>();
+                    if (acc != null && acc.enabled) {
+                        //Debug.Log("Found Accessory: " + relativePath);
+                        accs.Add(acc);
+                    }
                 }
         });
         allAccessories.accessories = accs.ToArray();
@@ -140,7 +142,7 @@ private static bool ValidateCreateAccFromMesh(){
     [MenuItem("Assets/Create/Airship/Accessories/Create Outfit Accessories from Mesh")]
     static void CreateAccFromMesh(){
         processedPaths.Clear();
-        defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials//MaterialLibrary/Organic/Clay.mat");
+        defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials/MaterialLibrary/Clay.mat");
         var objects = Selection.GetFiltered<GameObject>(AssetModeMask);
         foreach(var obj in objects){
             Debug.Log("Unpacking: " + obj.name);