Skip to content

Commit

Permalink
Merge pull request #177 from Unity-Technologies/staging
Browse files Browse the repository at this point in the history 
0.0.6 staging -> master
  • Loading branch information
@amirebrahimi
amirebrahimi authored May 12, 2017
2 parents da638d5 + 73dcd46 commit 1253841
Show file tree
Hide file tree
Showing 50 changed files with 578 additions and 1,106 deletions.
3 changes: 3 additions & 0 deletions Menus/MainMenu/MainMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ void CreateFaceButtons(List<Type> types)
provider.settingsMenuInstance = m_MainMenuUI.AddSubmenu(buttonData.sectionName, provider.settingsMenuPrefab);
});
}

if (customMenuAttribute != null && customMenuAttribute.tooltip != null)
b.tooltipText = customMenuAttribute.tooltip.tooltipText;
});
}
}
Expand Down
111 changes: 54 additions & 57 deletions Menus/MainMenu/Prefabs/MenuFace.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 224000012046007752}
- 114: {fileID: 114000014048498192}
- 114: {fileID: 114000012901787054}
- component: {fileID: 224000012046007752}
- component: {fileID: 114000014048498192}
- component: {fileID: 114000012901787054}
m_Layer: 5
m_Name: ButtonGrid
m_TagString: Untagged
Expand All @@ -33,11 +33,11 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 4000014077601618}
- 33: {fileID: 33000011761534160}
- 137: {fileID: 137000010769614414}
- component: {fileID: 4000014077601618}
- component: {fileID: 33000011761534160}
- component: {fileID: 137000010769614414}
m_Layer: 0
m_Name: TitleIcon
m_TagString: Untagged
Expand All @@ -50,14 +50,14 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 224000011294836516}
- 223: {fileID: 223000012805865200}
- 114: {fileID: 114000012004038330}
- 114: {fileID: 114000013614773404}
- 114: {fileID: 114000012540919192}
- 225: {fileID: 225000011820790320}
- component: {fileID: 224000011294836516}
- component: {fileID: 223000012805865200}
- component: {fileID: 114000012004038330}
- component: {fileID: 114000013614773404}
- component: {fileID: 114000012540919192}
- component: {fileID: 225000011820790320}
m_Layer: 5
m_Name: MenuFace
m_TagString: Untagged
Expand All @@ -70,11 +70,11 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 4000010544386176}
- 33: {fileID: 33000014220048304}
- 23: {fileID: 23000012074004932}
- component: {fileID: 4000010544386176}
- component: {fileID: 33000014220048304}
- component: {fileID: 23000012074004932}
m_Layer: 0
m_Name: BorderOutline
m_TagString: Untagged
Expand All @@ -87,12 +87,12 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 224000010431111768}
- 222: {fileID: 222000011972603126}
- 114: {fileID: 114000012702133128}
- 114: {fileID: 114000010693038044}
- component: {fileID: 224000010431111768}
- component: {fileID: 222000011972603126}
- component: {fileID: 114000012702133128}
- component: {fileID: 114000010693038044}
m_Layer: 5
m_Name: ButtonsMask
m_TagString: Untagged
Expand All @@ -105,12 +105,12 @@ GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 224000010897006452}
- 114: {fileID: 114000013559505558}
- 222: {fileID: 222000010488777626}
- 114: {fileID: 114000013499017046}
- component: {fileID: 224000010897006452}
- component: {fileID: 114000013559505558}
- component: {fileID: 222000010488777626}
- component: {fileID: 114000013499017046}
m_Layer: 5
m_Name: ButtonsScrollRect
m_TagString: Untagged
Expand All @@ -123,11 +123,11 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 224000013513340820}
- 222: {fileID: 222000010078248208}
- 114: {fileID: 114000013940025958}
- component: {fileID: 224000013513340820}
- component: {fileID: 222000010078248208}
- component: {fileID: 114000013940025958}
m_Layer: 5
m_Name: TitleText
m_TagString: Untagged
Expand All @@ -144,10 +144,10 @@ Transform:
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 252.50934, z: 0.9865579}
m_LocalScale: {x: 2000.0002, y: 2000.0002, z: 12.331977}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 224000011294836516}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4000014077601618
Transform:
m_ObjectHideFlags: 1
Expand All @@ -157,10 +157,10 @@ Transform:
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalPosition: {x: -112.00004, y: 461.50934, z: 0.909}
m_LocalScale: {x: 2000.0004, y: 2000, z: 12.33198}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 224000011294836516}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000012074004932
MeshRenderer:
m_ObjectHideFlags: 1
Expand All @@ -175,20 +175,23 @@ MeshRenderer:
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 2100000, guid: 552c79e14b5f355429da3b0617fd3a77, 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: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 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 &33000011761534160
MeshFilter:
Expand All @@ -215,7 +218,6 @@ MonoBehaviour:
m_Script: {fileID: -1200242548, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_ShowMaskGraphic: 0
--- !u!114 &114000012004038330
MonoBehaviour:
Expand All @@ -228,7 +230,6 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
Expand All @@ -250,7 +251,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b175c00e798af2f4b8e419ea7236f0eb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_BorderOutline: {fileID: 23000012074004932}
m_CanvasGroup: {fileID: 225000011820790320}
m_FaceTitle: {fileID: 114000013940025958}
Expand All @@ -268,7 +268,6 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_Material: {fileID: 2100000, guid: 2bf39d4275e117e4189340f2739de824, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
Expand Down Expand Up @@ -296,7 +295,6 @@ MonoBehaviour:
m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &114000013499017046
Expand All @@ -310,7 +308,6 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
Expand Down Expand Up @@ -338,11 +335,10 @@ MonoBehaviour:
m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_Content: {fileID: 224000012046007752}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 2
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
Expand Down Expand Up @@ -370,7 +366,6 @@ MonoBehaviour:
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
Expand All @@ -387,7 +382,6 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_Material: {fileID: 2100000, guid: dec2d25be9058334c91a0402762efa61, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
Expand Down Expand Up @@ -421,7 +415,6 @@ MonoBehaviour:
m_Script: {fileID: -2095666955, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RunInEditMode: 0
m_Padding:
m_Left: 0
m_Right: 0
Expand All @@ -448,20 +441,23 @@ SkinnedMeshRenderer:
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 2100000, guid: 8bd9ff8b835cffa489137898df169aa6, 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: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 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
serializedVersion: 2
m_Quality: 0
Expand Down Expand Up @@ -501,7 +497,7 @@ Canvas:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012439615790}
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
Expand All @@ -510,6 +506,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand All @@ -522,11 +519,11 @@ RectTransform:
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.0000001}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 224000010897006452}
m_Father: {fileID: 224000011294836516}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.03276894, y: 0.034720626}
m_AnchorMax: {x: 0.96723104, y: 0.8348801}
m_AnchoredPosition: {x: 0, y: 6.425156}
Expand All @@ -541,11 +538,11 @@ RectTransform:
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: 224000012046007752}
m_Father: {fileID: 224000010431111768}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.0000038146973, y: 0.0000076293945}
Expand All @@ -560,14 +557,14 @@ RectTransform:
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: 4000014077601618}
- {fileID: 4000010544386176}
- {fileID: 224000013513340820}
- {fileID: 224000010431111768}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 79, y: -70}
Expand All @@ -582,13 +579,13 @@ RectTransform:
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: []
m_Father: {fileID: 224000010897006452}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -0.00009918213, y: 0}
m_AnchoredPosition: {x: -0.0000076293945, y: 0}
m_SizeDelta: {x: 279.79852, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!224 &224000013513340820
Expand All @@ -600,10 +597,10 @@ RectTransform:
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: []
m_Father: {fileID: 224000011294836516}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.0415801, y: 0.8602893}
m_AnchorMax: {x: 0.9584199, y: 0.96668}
m_AnchoredPosition: {x: -0.000005722046, y: 0}
Expand Down
Loading

0 comments on commit 1253841

Please sign in to comment.