Merge pull request #99 from gelic-idealab/release/v0.5.7

Release/v0.5.7
gelic-idealab · Feb 22, 2022 · 87a768b · 87a768b
2 parents 184f700 + 98d6915
commit 87a768b
Show file tree

Hide file tree

Showing 12 changed files with 401 additions and 162 deletions.
diff --git a/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity b/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity
@@ -1490,6 +1490,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 466993260}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &537367088 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2836976638233774838, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &563281558
 GameObject:
   m_ObjectHideFlags: 0
@@ -2557,6 +2563,12 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 973271896}
   m_CullTransparentMesh: 0
+--- !u!1 &1000821145 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6562735218296722012, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1007862607
 GameObject:
   m_ObjectHideFlags: 0
@@ -3193,6 +3205,12 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &1467436398 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4554182674405035392, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1492960246
 GameObject:
   m_ObjectHideFlags: 0
@@ -3287,6 +3305,12 @@ Transform:
   m_Father: {fileID: 1429055715}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1519318782 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1647611369614546358, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1576435841
 GameObject:
   m_ObjectHideFlags: 0
@@ -3631,6 +3655,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   HeightCalibrationPrompt: {fileID: 1894506611}
+--- !u!1 &1783489463 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4809422465819357018, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1783642755
 GameObject:
   m_ObjectHideFlags: 0
@@ -3676,6 +3706,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isAvatarLoadingFinished: 0
   isAssetImportFinished: 0
+--- !u!1 &1802573412 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2836976637601657922, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+    type: 3}
+  m_PrefabInstance: {fileID: 6164736969038234896}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1858107717
 GameObject:
   m_ObjectHideFlags: 0
@@ -3945,6 +3981,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a3aee8430c34289498b0cef334f00308, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  settingsMenu: {fileID: 537367088}
+  heightCalibration: {fileID: 1519318782}
+  calibrationButtons: {fileID: 1783489463}
+  manuallyAdjustHeight: {fileID: 1000821145}
+  createTab: {fileID: 1802573412}
+  instructorMenuButton: {fileID: 1467436398}
   menuPrefab: {fileID: 8457062631950154484, guid: 3773d0422e0122743ad9688a0d03d9dd,
     type: 3}
   menu: {fileID: 0}
@@ -4259,6 +4301,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 584537264587685621, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 933467248997533625, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
         type: 3}
       propertyPath: m_TargetGraphic
@@ -4549,6 +4596,11 @@ PrefabInstance:
       propertyPath: m_PixelsPerUnitMultiplier
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 4614332731099142420, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
+        type: 3}
+      propertyPath: m_IgnoreLayout
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4813975391637574179, guid: 0a1fe9a4692a92b429808dc7c4de1de1,
         type: 3}
       propertyPath: m_TargetGraphic

diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab
@@ -1964,10 +1964,10 @@ RectTransform:
   m_Father: {fileID: 4412587301453036306}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 58.475, y: -23.1}
-  m_SizeDelta: {x: 116.95, y: 23.1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7828725554856808149
 CanvasRenderer:
@@ -2641,6 +2641,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   recordButtons: {fileID: 5557383594187636121}
   startCapture: {fileID: 3502234553169896962}
+  stopCapture: {fileID: 0}
 --- !u!1 &2269231602577643210
 GameObject:
   m_ObjectHideFlags: 0
@@ -2853,12 +2854,13 @@ RectTransform:
   - {fileID: 8766869811656989108}
   - {fileID: 1513055521243621629}
   - {fileID: 7700205267672626258}
+  - {fileID: 4412587301453036306}
   m_Father: {fileID: 7700205268373815943}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 110, y: -195}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1377807928677562121
@@ -9591,7 +9593,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.6, y: 67}
+  m_AnchoredPosition: {x: 0.5999985, y: 67}
   m_SizeDelta: {x: 75, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7700205267672626262
@@ -9743,7 +9745,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
+  m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: 40
   m_PreferredWidth: -1
@@ -10439,7 +10441,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7700205268373815943
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10457,14 +10459,13 @@ RectTransform:
   - {fileID: 2040148651102960158}
   - {fileID: 6146054443224164992}
   - {fileID: 1171450253079820188}
-  - {fileID: 4412587301453036306}
   m_Father: {fileID: 7700205267839848467}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -450}
-  m_SizeDelta: {x: 220, y: 200}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &7700205268373815940
 CanvasRenderer:
@@ -11394,19 +11395,19 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8264630741974140406}
-  m_LocalRotation: {x: -0.00000013411044, y: -0.00000017136337, z: 0.000000006434272,
+  m_LocalRotation: {x: -0.00000016391277, y: -0.00000020116568, z: 0.0000000064342696,
     w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2053802130853916179}
-  m_Father: {fileID: 7700205268373815943}
-  m_RootOrder: 6
+  m_Father: {fileID: 2040148651102960158}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 109.999985, y: -180}
-  m_SizeDelta: {x: 116.95, y: 23.1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8044154169688092783
 CanvasRenderer:
@@ -11514,7 +11515,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
+  m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: 30
   m_PreferredWidth: -1
@@ -11819,6 +11820,12 @@ MonoBehaviour:
   brushToggle: {fileID: 5720538800747667725}
   leaveAndRejoinButton: {fileID: 5790234758553503690}
   closeConnectionAndRejoinButton: {fileID: 2411945462265822991}
+  settingsTab: {fileID: 3915486095905569679}
+  peopleTab: {fileID: 6688689522628545538}
+  interactTab: {fileID: 8928291943553237011}
+  createTab: {fileID: 4882718586060955810}
+  instructorOnlyMenu: {fileID: 2129399405881988721}
+  instructorMenuButton: {fileID: 5016686006325802627}
 --- !u!114 &4193681595172214892
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab
@@ -1597,6 +1597,7 @@ MonoBehaviour:
   turningDegrees: 30
   floorIndicator: {fileID: 7025737383977934158}
   spectatorCamera: {fileID: 2310806580219041903}
+  teleportationIndicator: {fileID: 3960927628016846710}
   teleportPlayer: {fileID: 2312374686204318205}
 --- !u!1 &2311064594000191400
 GameObject:
@@ -5882,6 +5883,11 @@ PrefabInstance:
       propertyPath: onTabDeselected.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
       value: UnityEngine.Object, UnityEngine
       objectReference: {fileID: 0}
+    - target: {fileID: 903431471936899710, guid: 3773d0422e0122743ad9688a0d03d9dd,
+        type: 3}
+      propertyPath: stopCapture
+      value: 
+      objectReference: {fileID: 4577315404903450322}
     - target: {fileID: 910671982501289634, guid: 3773d0422e0122743ad9688a0d03d9dd,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -7292,18 +7298,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3773d0422e0122743ad9688a0d03d9dd, type: 3}
---- !u!1 &1613546599041571675 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6621998759338005293, guid: 3773d0422e0122743ad9688a0d03d9dd,
-    type: 3}
-  m_PrefabInstance: {fileID: 5585141783354067062}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &2053354391588966216 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5907757533000681278, guid: 3773d0422e0122743ad9688a0d03d9dd,
-    type: 3}
-  m_PrefabInstance: {fileID: 5585141783354067062}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5411380586401879295 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 476111782108142729, guid: 3773d0422e0122743ad9688a0d03d9dd,
@@ -7334,3 +7328,21 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5585141783354067062}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4577315404903450322 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8216690834694950564, guid: 3773d0422e0122743ad9688a0d03d9dd,
+    type: 3}
+  m_PrefabInstance: {fileID: 5585141783354067062}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2053354391588966216 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5907757533000681278, guid: 3773d0422e0122743ad9688a0d03d9dd,
+    type: 3}
+  m_PrefabInstance: {fileID: 5585141783354067062}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1613546599041571675 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6621998759338005293, guid: 3773d0422e0122743ad9688a0d03d9dd,
+    type: 3}
+  m_PrefabInstance: {fileID: 5585141783354067062}
+  m_PrefabAsset: {fileID: 0}
diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ClientSpawnManager.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ClientSpawnManager.cs
@@ -98,7 +98,13 @@ public enum INTERACTIONS
         UNLOCK = 9,
         LINE = 10,
         LINE_END = 11,
+        SHOW_MENU = 12,
+        HIDE_MENU = 13,
 
+        SETTING_TAB = 14,
+        PEOPLE_TAB = 15,
+        INTERACTION_TAB = 16,
+        CREATE_TAB = 17,
     }
     #endregion
     /// <summary>
@@ -1182,6 +1188,17 @@ private Vector3 GetSlotLocation(int slot)
             return location;
         }
 
+        public void SendMenuInteractionsType(int interaction) {
+            NetworkUpdateHandler.Instance.SendSyncInteractionMessage (new Interaction 
+            {
+                sourceEntity_id = NetworkUpdateHandler.Instance.client_id,
+
+                interactionType = interaction,
+
+                targetEntity_id = 0,
+            });
+        }
+
         #endregion
     }
 }
diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs
@@ -46,6 +46,9 @@ public class FreeFlightController : MonoBehaviour, IUpdatable
         public GameObject floorIndicator;
         [SerializeField] private Camera spectatorCamera;
 
+        [Tooltip("Hierarchy: Spectator Camera -> TeleportationLine")]
+        [SerializeField] private GameObject teleportationIndicator;
+
         Vector3 targetPosition; // this is the position that the floorIndicator should be;
 
         private Transform desktopCamera;
@@ -454,9 +457,7 @@ public static float ClampAngle(float angle, float min, float max)
         /// Show teleportation indicator while holding right click.
         /// </Summary>
         public void ShowTeleportationIndicator()
-        {
-            GameObject teleportationIndicator = gameObject.transform.Find("TeleportationLine").gameObject;
-
+        {  
             if (Input.GetMouseButtonDown(1)) {
 
                 teleportationIndicator.SetActive(true);