Merge pull request #39 from Capstone-Projects-2021-Spring/Eyeballs

Readded the eyeballs to the player controller
Capstone-Projects-2021-Spring · Apr 24, 2021 · 24e9e73 · 24e9e73
2 parents 631576a + ddcd660
commit 24e9e73
Show file tree

Hide file tree

Showing 3 changed files with 351 additions and 359 deletions.
diff --git a/Assets/Plugins/GitHub.meta b/Assets/Plugins/GitHub.meta
diff --git a/Assets/Resources/PhotonPrefabs/PlayerController.prefab b/Assets/Resources/PhotonPrefabs/PlayerController.prefab
@@ -1622,7 +1622,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556369328161610}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.286, z: 0.179}
+  m_LocalPosition: {x: 0, y: 0.286, z: 0.28}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4732556370444169026}
@@ -1735,7 +1735,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556370154465215}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.4511928, y: -0.09942657, z: -2.8233626}
+  m_LocalPosition: {x: 0.5, y: -0.09942657, z: -2.8233626}
   m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 4732556370206371950}
@@ -1827,7 +1827,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556370206371951}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.43999994}
+  m_LocalPosition: {x: 0, y: 0, z: 0.413}
   m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
   m_Children: []
   m_Father: {fileID: 4732556370154465214}
@@ -2429,7 +2429,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556370538788306}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.43999994}
+  m_LocalPosition: {x: 0, y: 0, z: 0.413}
   m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
   m_Children: []
   m_Father: {fileID: 4732556370700176312}
@@ -2520,7 +2520,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556370700176313}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.065192774, y: -0.09942657, z: -2.8233626}
+  m_LocalPosition: {x: 0, y: -0.09942657, z: -2.8233626}
   m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 4732556370538788309}
@@ -2600,7 +2600,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4732556371021715647
 Transform:
   m_ObjectHideFlags: 0
@@ -2609,7 +2609,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4732556371021715644}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.25819278, y: 0.95, z: 3.223}
+  m_LocalPosition: {x: -0.25819278, y: 0.95, z: 3.142}
   m_LocalScale: {x: 1, y: 1.3000001, z: 1}
   m_Children:
   - {fileID: 4732556370154465214}