Merge pull request #1803 from StephenHodgson/Stabilization

Moved UNET Sharing code out into examples
microsoft · Mar 7, 2018 · 3dfeab5 · 3dfeab5
2 parents 8066264 + b231520
commit 3dfeab5
Show file tree

Hide file tree

Showing 71 changed files with 78 additions and 67 deletions.
diff --git a/...Toolkit/SharingWithUNET/UI/Materials.meta → ...t-Examples/SharingWithUNET/Materials.meta b/...Toolkit/SharingWithUNET/UI/Materials.meta → ...t-Examples/SharingWithUNET/Materials.meta
diff --git a/...ithUNET/UI/Materials/ButtonBackground.mat → ...ngWithUNET/Materials/ButtonBackground.mat b/...ithUNET/UI/Materials/ButtonBackground.mat → ...ngWithUNET/Materials/ButtonBackground.mat
diff --git a/...ET/UI/Materials/ButtonBackground.mat.meta → ...hUNET/Materials/ButtonBackground.mat.meta b/...ET/UI/Materials/ButtonBackground.mat.meta → ...hUNET/Materials/ButtonBackground.mat.meta
diff --git a/...ithUNET/UI/Materials/ButtonForeground.mat → ...ngWithUNET/Materials/ButtonForeground.mat b/...ithUNET/UI/Materials/ButtonForeground.mat → ...ngWithUNET/Materials/ButtonForeground.mat
diff --git a/...ET/UI/Materials/ButtonForeground.mat.meta → ...hUNET/Materials/ButtonForeground.mat.meta b/...ET/UI/Materials/ButtonForeground.mat.meta → ...hUNET/Materials/ButtonForeground.mat.meta
diff --git a/...ngWithUNET/UI/Materials/ButtonIcon-72.png → ...aringWithUNET/Materials/ButtonIcon-72.png b/...ngWithUNET/UI/Materials/ButtonIcon-72.png → ...aringWithUNET/Materials/ButtonIcon-72.png
diff --git a/...hUNET/UI/Materials/ButtonIcon-72.png.meta → ...WithUNET/Materials/ButtonIcon-72.png.meta b/...hUNET/UI/Materials/ButtonIcon-72.png.meta → ...WithUNET/Materials/ButtonIcon-72.png.meta
diff --git a/...ngWithUNET/UI/Materials/ButtonIcon-73.png → ...aringWithUNET/Materials/ButtonIcon-73.png b/...ngWithUNET/UI/Materials/ButtonIcon-73.png → ...aringWithUNET/Materials/ButtonIcon-73.png
diff --git a/...hUNET/UI/Materials/ButtonIcon-73.png.meta → ...WithUNET/Materials/ButtonIcon-73.png.meta b/...hUNET/UI/Materials/ButtonIcon-73.png.meta → ...WithUNET/Materials/ButtonIcon-73.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-66.png → ...ringWithUNET/Materials/ButtonIcons-66.png b/...gWithUNET/UI/Materials/ButtonIcons-66.png → ...ringWithUNET/Materials/ButtonIcons-66.png
diff --git a/...UNET/UI/Materials/ButtonIcons-66.png.meta → ...ithUNET/Materials/ButtonIcons-66.png.meta b/...UNET/UI/Materials/ButtonIcons-66.png.meta → ...ithUNET/Materials/ButtonIcons-66.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-67.png → ...ringWithUNET/Materials/ButtonIcons-67.png b/...gWithUNET/UI/Materials/ButtonIcons-67.png → ...ringWithUNET/Materials/ButtonIcons-67.png
diff --git a/...UNET/UI/Materials/ButtonIcons-67.png.meta → ...ithUNET/Materials/ButtonIcons-67.png.meta b/...UNET/UI/Materials/ButtonIcons-67.png.meta → ...ithUNET/Materials/ButtonIcons-67.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-68.png → ...ringWithUNET/Materials/ButtonIcons-68.png b/...gWithUNET/UI/Materials/ButtonIcons-68.png → ...ringWithUNET/Materials/ButtonIcons-68.png
diff --git a/...UNET/UI/Materials/ButtonIcons-68.png.meta → ...ithUNET/Materials/ButtonIcons-68.png.meta b/...UNET/UI/Materials/ButtonIcons-68.png.meta → ...ithUNET/Materials/ButtonIcons-68.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-69.png → ...ringWithUNET/Materials/ButtonIcons-69.png b/...gWithUNET/UI/Materials/ButtonIcons-69.png → ...ringWithUNET/Materials/ButtonIcons-69.png
diff --git a/...UNET/UI/Materials/ButtonIcons-69.png.meta → ...ithUNET/Materials/ButtonIcons-69.png.meta b/...UNET/UI/Materials/ButtonIcons-69.png.meta → ...ithUNET/Materials/ButtonIcons-69.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-70.png → ...ringWithUNET/Materials/ButtonIcons-70.png b/...gWithUNET/UI/Materials/ButtonIcons-70.png → ...ringWithUNET/Materials/ButtonIcons-70.png
diff --git a/...UNET/UI/Materials/ButtonIcons-70.png.meta → ...ithUNET/Materials/ButtonIcons-70.png.meta b/...UNET/UI/Materials/ButtonIcons-70.png.meta → ...ithUNET/Materials/ButtonIcons-70.png.meta
diff --git a/...gWithUNET/UI/Materials/ButtonIcons-71.png → ...ringWithUNET/Materials/ButtonIcons-71.png b/...gWithUNET/UI/Materials/ButtonIcons-71.png → ...ringWithUNET/Materials/ButtonIcons-71.png
diff --git a/...UNET/UI/Materials/ButtonIcons-71.png.meta → ...ithUNET/Materials/ButtonIcons-71.png.meta b/...UNET/UI/Materials/ButtonIcons-71.png.meta → ...ithUNET/Materials/ButtonIcons-71.png.meta
diff --git a/...ringWithUNET/UI/Materials/ButtonPlate.png → ...SharingWithUNET/Materials/ButtonPlate.png b/...ringWithUNET/UI/Materials/ButtonPlate.png → ...SharingWithUNET/Materials/ButtonPlate.png
diff --git a/...ithUNET/UI/Materials/ButtonPlate.png.meta → ...ngWithUNET/Materials/ButtonPlate.png.meta b/...ithUNET/UI/Materials/ButtonPlate.png.meta → ...ngWithUNET/Materials/ButtonPlate.png.meta
diff --git a/...WithUNET/UI/Materials/ButtonPlates-01.png → ...ingWithUNET/Materials/ButtonPlates-01.png b/...WithUNET/UI/Materials/ButtonPlates-01.png → ...ingWithUNET/Materials/ButtonPlates-01.png
diff --git a/...NET/UI/Materials/ButtonPlates-01.png.meta → ...thUNET/Materials/ButtonPlates-01.png.meta b/...NET/UI/Materials/ButtonPlates-01.png.meta → ...thUNET/Materials/ButtonPlates-01.png.meta
diff --git a/...WithUNET/UI/Materials/ButtonPlates-02.png → ...ingWithUNET/Materials/ButtonPlates-02.png b/...WithUNET/UI/Materials/ButtonPlates-02.png → ...ingWithUNET/Materials/ButtonPlates-02.png
diff --git a/...NET/UI/Materials/ButtonPlates-02.png.meta → ...thUNET/Materials/ButtonPlates-02.png.meta b/...NET/UI/Materials/ButtonPlates-02.png.meta → ...thUNET/Materials/ButtonPlates-02.png.meta
diff --git a/...WithUNET/UI/Materials/ButtonPlates-03.png → ...ingWithUNET/Materials/ButtonPlates-03.png b/...WithUNET/UI/Materials/ButtonPlates-03.png → ...ingWithUNET/Materials/ButtonPlates-03.png
diff --git a/...NET/UI/Materials/ButtonPlates-03.png.meta → ...thUNET/Materials/ButtonPlates-03.png.meta b/...NET/UI/Materials/ButtonPlates-03.png.meta → ...thUNET/Materials/ButtonPlates-03.png.meta
diff --git a/...WithUNET/UI/Materials/ButtonPlates-04.png → ...ingWithUNET/Materials/ButtonPlates-04.png b/...WithUNET/UI/Materials/ButtonPlates-04.png → ...ingWithUNET/Materials/ButtonPlates-04.png
diff --git a/...NET/UI/Materials/ButtonPlates-04.png.meta → ...thUNET/Materials/ButtonPlates-04.png.meta b/...NET/UI/Materials/ButtonPlates-04.png.meta → ...thUNET/Materials/ButtonPlates-04.png.meta
diff --git a/.../UI/Materials/ToolsCircle_20160902-55.png → ...NET/Materials/ToolsCircle_20160902-55.png b/.../UI/Materials/ToolsCircle_20160902-55.png → ...NET/Materials/ToolsCircle_20160902-55.png
diff --git a/...aterials/ToolsCircle_20160902-55.png.meta → ...aterials/ToolsCircle_20160902-55.png.meta b/...aterials/ToolsCircle_20160902-55.png.meta → ...aterials/ToolsCircle_20160902-55.png.meta
diff --git a/...kit/SharingWithUNET/Prefabs/Player.prefab → ...les/SharingWithUNET/Prefabs/Player.prefab b/...kit/SharingWithUNET/Prefabs/Player.prefab → ...les/SharingWithUNET/Prefabs/Player.prefab
@@ -16,12 +16,12 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 4000010264513424}
-  - 33: {fileID: 33000010403557236}
-  - 65: {fileID: 65000012095097042}
-  - 23: {fileID: 23000013927414046}
+  - component: {fileID: 4000010264513424}
+  - component: {fileID: 33000010403557236}
+  - component: {fileID: 65000012095097042}
+  - component: {fileID: 23000013927414046}
   m_Layer: 0
   m_Name: Cube
   m_TagString: Untagged
@@ -34,11 +34,11 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 4000011307205380}
-  - 114: {fileID: 114000013410669756}
-  - 114: {fileID: 114000013771453016}
+  - component: {fileID: 4000011307205380}
+  - component: {fileID: 114000013410669756}
+  - component: {fileID: 114000013771453016}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -55,10 +55,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 4000011307205380}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4000011307205380
 Transform:
   m_ObjectHideFlags: 1
@@ -68,11 +68,11 @@ Transform:
   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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 4000010264513424}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &23000013927414046
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -82,25 +82,30 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
   - {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
-  m_SelectedWireframeHidden: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
 --- !u!33 &33000010403557236
 MeshFilter:
@@ -165,3 +170,5 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   bullet: {fileID: 1000013437630216, guid: f59738f66a2923a44b1de68dd1887fd0, type: 2}
+  CanShareAnchors: 0
+  SharesSpatialAnchors: 0
diff --git a/...haringWithUNET/Prefabs/Player.prefab.meta → ...haringWithUNET/Prefabs/Player.prefab.meta b/...haringWithUNET/Prefabs/Player.prefab.meta → ...haringWithUNET/Prefabs/Player.prefab.meta