Fix assembly definitions to allow android build

UCL-VR · Jan 26, 2024 · f769c71 · f769c71
1 parent fe24627
commit f769c71
Show file tree

Hide file tree

Showing 24 changed files with 611 additions and 512 deletions.
diff --git a/.../Assets/Runtime/ExampleAvatar/Editor.meta → Unity/Assets/Editor/ExampleAvatar.meta b/.../Assets/Runtime/ExampleAvatar/Editor.meta → Unity/Assets/Editor/ExampleAvatar.meta
diff --git a/...mpleAvatar/Editor/TexturedAvatarEditor.cs → ...tor/ExampleAvatar/TexturedAvatarEditor.cs b/...mpleAvatar/Editor/TexturedAvatarEditor.cs → ...tor/ExampleAvatar/TexturedAvatarEditor.cs
diff --git a/...vatar/Editor/TexturedAvatarEditor.cs.meta → ...xampleAvatar/TexturedAvatarEditor.cs.meta b/...vatar/Editor/TexturedAvatarEditor.cs.meta → ...xampleAvatar/TexturedAvatarEditor.cs.meta
diff --git a/Unity/Assets/Runtime/Scenes/Editor.meta → Unity/Assets/Editor/Scenes.meta b/Unity/Assets/Runtime/Scenes/Editor.meta → Unity/Assets/Editor/Scenes.meta
diff --git a/.../Runtime/Scenes/Editor/SceneInfoEditor.cs → ...y/Assets/Editor/Scenes/SceneInfoEditor.cs b/.../Runtime/Scenes/Editor/SceneInfoEditor.cs → ...y/Assets/Editor/Scenes/SceneInfoEditor.cs
diff --git a/...ime/Scenes/Editor/SceneInfoEditor.cs.meta → ...ets/Editor/Scenes/SceneInfoEditor.cs.meta b/...ime/Scenes/Editor/SceneInfoEditor.cs.meta → ...ets/Editor/Scenes/SceneInfoEditor.cs.meta
diff --git a/Unity/Assets/Runtime/Prefabs/Network Scene.prefab b/Unity/Assets/Runtime/Prefabs/Network Scene.prefab
@@ -24,13 +24,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3296437958450568961}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7068762446378101729}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5397502033434242698
 MonoBehaviour:
@@ -70,13 +70,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7068762446051028577}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7068762446378101729}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3130174346742382869
 MonoBehaviour:
@@ -117,6 +117,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7068762446378101732}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -127,7 +128,6 @@ Transform:
   - {fileID: 995552508608854795}
   - {fileID: 7077963114111146354}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2260868788067765717
 MonoBehaviour:
@@ -162,7 +162,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   servers:
   - {fileID: -7849211376014683480, guid: 1c91df7c43c1dbe4fb0fb303e71a2790, type: 2}
-  reconnectBehaviour: 2
+  reconnectBehaviour: 0
 --- !u!114 &7068762446378101731
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -217,13 +217,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7068762446826474295}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7068762446378101729}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6824257153444348250
 MonoBehaviour:
@@ -267,13 +267,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9015508115495883622}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7068762446378101729}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1919805387
 MonoBehaviour:

diff --git a/Unity/Assets/Runtime/Scenes.meta b/Unity/Assets/Runtime/Scenes.meta
diff --git a/Unity/Assets/Runtime/Voip/Implementations/Dotnet/Ubiq.Voip.Implementations.Dotnet.asmdef b/Unity/Assets/Runtime/Voip/Implementations/Dotnet/Ubiq.Voip.Implementations.Dotnet.asmdef
@@ -6,7 +6,6 @@
     ],
     "includePlatforms": [],
     "excludePlatforms": [
-        "Android",
         "Editor",
         "iOS",
         "LinuxStandalone64",

diff --git a/Unity/Assets/Runtime/Voip/Implementations/Unity/Ubiq.Voip.Implementations.Unity.asmdef b/Unity/Assets/Runtime/Voip/Implementations/Unity/Ubiq.Voip.Implementations.Unity.asmdef
@@ -6,7 +6,6 @@
         "GUID:f12aafacab75a87499e7e45c873ffab8"
     ],
     "includePlatforms": [
-        "Android",
         "Editor",
         "iOS",
         "LinuxStandalone64",