Merge branch 'main' into feature/unity-gltf-export

icosa-foundation · Mar 22, 2024 · 981569c · 981569c
2 parents c2b5662 + f9398d1
commit 981569c
Show file tree

Hide file tree

Showing 46 changed files with 30,771 additions and 230 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -636,6 +636,8 @@ jobs:
 
           cd StandaloneOSX/
           codesign --deep --force --verify --verbose --timestamp --options runtime --entitlements ../Support/macos/OpenBrush.entitlements --sign "Developer ID Application: Icosa Gallery Ltd (${{ vars.APPLE_TEAM_ID }})" $FILENAME/Contents/Support/ThirdParty/ffmpeg/bin/ffmpeg
+          codesign --deep --force --verify --verbose --timestamp --options runtime --entitlements ../Support/macos/OpenBrush.entitlements --sign "Developer ID Application: Icosa Gallery Ltd (${{ vars.APPLE_TEAM_ID }})" $FILENAME/Contents/Plugins/UsdCs.bundle
+          codesign --deep --force --verify --verbose --timestamp --options runtime --entitlements ../Support/macos/OpenBrush.entitlements --sign "Developer ID Application: Icosa Gallery Ltd (${{ vars.APPLE_TEAM_ID }})" $FILENAME/Contents/Plugins/lib_burst_generated.bundle
           codesign --deep --force --verify --verbose --timestamp --options runtime --entitlements ../Support/macos/OpenBrush.entitlements --sign "Developer ID Application: Icosa Gallery Ltd (${{ vars.APPLE_TEAM_ID }})" $FILENAME
 
       - name: Create a notarized DMG
@@ -855,7 +857,7 @@ jobs:
 
   publish_steam:
     name: Publish Steam Release
-    needs: [configuration, build, createdmg]
+    needs: [configuration, build]
     if: |
       github.event_name == 'push' &&
       github.repository == 'icosa-foundation/open-brush' &&

diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin
diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs
@@ -22,7 +22,7 @@
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEditor.Build.Reporting;
-#if UNITY_IPHONE
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
 #endif
 using UnityEditor.SceneManagement;
@@ -926,15 +926,37 @@ public void Dispose()
 
     class TempSetPlayerSettings : IDisposable
     {
+        private BuildTarget m_Target;
         private UIOrientation m_OrientationSettings;
+        private iOSTargetDevice m_iOSTargetDevice;
+        private Texture2D[] m_Icons;
+
         public TempSetPlayerSettings(TiltBuildOptions tiltOptions)
         {
+            m_Target = tiltOptions.Target;
             m_OrientationSettings = PlayerSettings.defaultInterfaceOrientation;
+            m_iOSTargetDevice = PlayerSettings.iOS.targetDevice;
+            m_Icons = PlayerSettings.GetIcons(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(TargetToGroup(m_Target)), IconKind.Any);
 
             switch (tiltOptions.XrSdk)
             {
                 case XrSdkMode.Zapbox:
                     PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
+                    PlayerSettings.iOS.targetDevice = iOSTargetDevice.iPhoneOnly;
+                    var zapboxIcon = AssetDatabase.LoadAssetAtPath<Texture2D>("Assets/Textures/Trademarked/TiltBrushLogoZapbox.png");
+
+                    Texture2D[] newIcons = { zapboxIcon };
+
+                    var buildTarget = UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(TargetToGroup(m_Target));
+
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Any);
+#if UNITY_IOS
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Notification);
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Settings);
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Spotlight);
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Notification);
+                    PlayerSettings.SetIcons(buildTarget, newIcons, IconKind.Store);
+#endif
                     break;
                 default:
                     break;
@@ -944,6 +966,8 @@ public TempSetPlayerSettings(TiltBuildOptions tiltOptions)
         public void Dispose()
         {
             PlayerSettings.defaultInterfaceOrientation = m_OrientationSettings;
+            PlayerSettings.iOS.targetDevice = m_iOSTargetDevice;
+            PlayerSettings.SetIcons(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(TargetToGroup(m_Target)), m_Icons, IconKind.Any);
             AssetDatabase.SaveAssets();
         }
     }
@@ -1819,7 +1843,7 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
                 {
                     // TODO: is it possible to embed loose files on iOS?
                     looseFilesDest = null;
-#if UNITY_IPHONE
+#if UNITY_IOS
                     string pbxPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj";
 
                     PBXProject project = new PBXProject();

diff --git a/Assets/Editor/SerializedPropertyReferenceDrawer.cs b/Assets/Editor/SerializedPropertyReferenceDrawer.cs
diff --git a/Assets/Editor/SerializedPropertyReferenceDrawer.cs.meta b/Assets/Editor/SerializedPropertyReferenceDrawer.cs.meta
diff --git a/Assets/Manifest_Zapbox.asset b/Assets/Manifest_Zapbox.asset
@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23720096ebad012489fb3db6e44e0a4c, type: 3}
+  m_Name: Manifest_Zapbox
+  m_EditorClassIdentifier: 
+  Brushes:
+  - {fileID: 11400000, guid: c80c2ea05a3d85e48858a322a18cf5bb, type: 2}
+  - {fileID: 11400000, guid: 816add3f326839c4cafce8bfc4a7e26b, type: 2}
+  - {fileID: 11400000, guid: 7a3a9d5ee2e492c49b1146ed03806398, type: 2}
+  - {fileID: 11400000, guid: a3243d2ad2f1f144d8c096c7a7f080f0, type: 2}
+  - {fileID: 11400000, guid: 79aad858cfe754d4bad6bb41091669d5, type: 2}
+  - {fileID: 11400000, guid: 4fff8e60f5ea7a843b57a7e35501241a, type: 2}
+  - {fileID: 11400000, guid: 4e0276a2779e02649886e0eabd8cc6f0, type: 2}
+  - {fileID: 11400000, guid: f2a3ea577216f00419871f50d71cc885, type: 2}
+  - {fileID: 11400000, guid: d7e129b9879e8b3499ccc4d81ca68ee2, type: 2}
+  - {fileID: 11400000, guid: cda3391ff768d1b49ab892abdcbe3c56, type: 2}
+  - {fileID: 11400000, guid: 695c0f01b9a7e91449b541ab1b30fc4f, type: 2}
+  - {fileID: 11400000, guid: c969cee8911aa4d4293ee395f822a70c, type: 2}
+  - {fileID: 11400000, guid: b477bd8a0ed72b643833f1c162ac6d0a, type: 2}
+  - {fileID: 11400000, guid: 659158fcdc71ae74c95d543604d4e9a2, type: 2}
+  - {fileID: 11400000, guid: eb608f68fb3036b47be357a021ed7618, type: 2}
+  - {fileID: 11400000, guid: b3384ba6cddfeb64ba4b7d4abed9a3e8, type: 2}
+  - {fileID: 11400000, guid: 2264f93e06f07674bb5327af480f9ffb, type: 2}
+  - {fileID: 11400000, guid: 700f3aa89a7c23848b8aea028905dd8c, type: 2}
+  - {fileID: 11400000, guid: 2b446bb08278e5440a49b5e6cf6abdee, type: 2}
+  - {fileID: 11400000, guid: e0abbc800f80e85449708924a0863dcc, type: 2}
+  - {fileID: 11400000, guid: 2f212815f4d3c1a4681afeeaf9c6dc37, type: 2}
+  - {fileID: 11400000, guid: 5061d2801862f4be9b0a635f8c7c8535, type: 2}
+  - {fileID: 11400000, guid: 991f6df195c83734f927996b42c074cb, type: 2}
+  - {fileID: 11400000, guid: cf7f00597aeb53a42b67c83d863a9ffa, type: 2}
+  - {fileID: 11400000, guid: 2bb4873d12aa1c64e804d4ac1cd5ea9f, type: 2}
+  - {fileID: 11400000, guid: 38318c20b5172439fa13885f1fdd14f0, type: 2}
+  - {fileID: 11400000, guid: 922fa490bfe22b54b887e9fd98ebdcc5, type: 2}
+  - {fileID: 11400000, guid: 9c8daf06e47430c47a2e2d1a4d27b04f, type: 2}
+  - {fileID: 11400000, guid: 939e4b3f7e611954da1a1d3925c27d9b, type: 2}
+  - {fileID: 11400000, guid: cd3afa141c6aeec4ebd43bb3042d14a2, type: 2}
+  Environments:
+  - {fileID: 11400000, guid: e7ee458a16eae2b48ac405f4ccc693e6, type: 2}
+  - {fileID: 11400000, guid: 5effa9d950f0f5943b60c7dd24471505, type: 2}
+  - {fileID: 11400000, guid: e493bfb624088664d89bd40212d93d4b, type: 2}
+  - {fileID: 11400000, guid: 68580816dd857264f9e48f299f24246a, type: 2}
+  - {fileID: 11400000, guid: a470d3298973f6848ad5c2715bad928b, type: 2}
+  - {fileID: 11400000, guid: 1ff166f5345466342ab1e14a0cf52810, type: 2}
+  - {fileID: 11400000, guid: 24d7b035c52552044a992efb353487f4, type: 2}
+  - {fileID: 11400000, guid: 95fb135d1a8f10a439edaadbeeebfebf, type: 2}
+  - {fileID: 11400000, guid: 498198474faa42846b3e333748264914, type: 2}
+  - {fileID: 11400000, guid: 0cac14d8dc99d284399801234e09c026, type: 2}
+  - {fileID: 11400000, guid: c1b260b015c6b0a479c50dee029cc5bc, type: 2}
+  - {fileID: 11400000, guid: a2472d544dd1bfd4c8f3288f9f7ee108, type: 2}
+  - {fileID: 11400000, guid: b42b208b245c1d34fabaf181763cd256, type: 2}
+  Locales:
+  - {fileID: 11400000, guid: 35f3779472064f74bafddfc140d73eb6, type: 2}
+  - {fileID: 11400000, guid: 24f69ae89af7fd24fb05a3798905dc72, type: 2}
+  - {fileID: 11400000, guid: f449db273dfc44449aa79eaa7135399b, type: 2}
+  - {fileID: 11400000, guid: ccffad35f32cd974cb4ed3f4b5cbccd8, type: 2}
+  - {fileID: 11400000, guid: f49fe9bebe68e674098c99a8c94562c4, type: 2}
+  - {fileID: 11400000, guid: 887d91eb154761a4cb852d5288e9a633, type: 2}
+  - {fileID: 11400000, guid: 5c5ec5e20869e384ba8781c68c5e3c51, type: 2}
+  CompatibilityBrushes:
+  - {fileID: 11400000, guid: 9d74e4f2898082d48885a67bc6f6e97d, type: 2}
+  - {fileID: 11400000, guid: 552a6b22c41f6514fbf6de142245a2ae, type: 2}
+  - {fileID: 11400000, guid: 1f21613e11c369544b6b6515aa112234, type: 2}
+  - {fileID: 11400000, guid: 0ed9d7bd0d4b1424eaa647281a7bb738, type: 2}
+  - {fileID: 11400000, guid: 510688aabb25f344daa830c8b8f5af16, type: 2}
+  - {fileID: 11400000, guid: e617036dc63ede649a1c716ac255dd88, type: 2}
+  - {fileID: 11400000, guid: d6c87eafa4cdba042933c1b4f6da46f7, type: 2}
+  - {fileID: 11400000, guid: ba0e0f27d49da824aa74ab60edd90a56, type: 2}
+  - {fileID: 11400000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2}
+  - {fileID: 11400000, guid: 987198ed6dc42fb48861ac40965edb58, type: 2}
+  - {fileID: 11400000, guid: 84463df8784ac6646ab814a16602c250, type: 2}
+  - {fileID: 11400000, guid: c0393f9ef118b8b4eac658e169ac8497, type: 2}
+  - {fileID: 11400000, guid: 1928962e383e7f04696634b06de5ff25, type: 2}
+  - {fileID: 11400000, guid: 2c424631fdf55254282d1aa5405ad63a, type: 2}
diff --git a/Assets/Manifest_Zapbox.asset.meta b/Assets/Manifest_Zapbox.asset.meta
diff --git a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabVideo.prefab b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabVideo.prefab
@@ -2160,11 +2160,11 @@ PrefabInstance:
         type: 3}
       propertyPath: m_Property.m_Target
       value: 
-      objectReference: {fileID: 76723185672001994}
+      objectReference: {fileID: 4781164090320310020}
     - target: {fileID: 7599348944369875173, guid: c2a88d23f4dea5a4aae06f33862c9716,
         type: 3}
       propertyPath: m_Property.m_PropertyName
-      value: hasChanged
+      value: SelectedVideoIsPlaying
       objectReference: {fileID: 0}
     - target: {fileID: 7599348944369875173, guid: c2a88d23f4dea5a4aae06f33862c9716,
         type: 3}