Latest CRs

Author: Stephen Hodgson

Assets/HoloToolkit/Utilities/Editor/SceneLauncherEditor.cs

@@ -31,6 +31,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(buttonSpawnLocationProperty);
             EditorGUILayout.PropertyField(buttonPrefabProperty);
             EditorGUILayout.IntSlider(buttonRowMaxProperty, 1, 10);
+            EditorGUILayout.HelpBox("To add scenes to the Scene Mapper by adding scenes in the build window.", MessageType.Info);
             CheckBuildScenes(sceneMappingProperty);
             ShowSceneList(sceneMappingProperty);
             serializedObject.ApplyModifiedProperties();

Assets/HoloToolkit/Utilities/Prefabs/SceneLauncher.prefab

@@ -85,7 +85,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1177239735944006}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.2, z: 0}
+  m_LocalPosition: {x: -0.217, y: 0.23, z: 0}
   m_LocalScale: {x: 0.005, y: 0.005, z: 0.005}
   m_Children: []
   m_Father: {fileID: 4663534091094826}
@@ -225,21 +225,17 @@ TextMesh:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1177239735944006}
-  m_Text: 'Air tap a scene to load it.
-
-    When finished with a scene, say "Scene Launcher" or press the Backspace key to
-    return the this scene list.
-
-    Edit the scenes in this list in Unity > File > Build Settings > Scenes in Build.
-
-    Make sure that this scene (SceneLauncher) is the first scene (#0).
-
-    If you would like to use all scenes in the project, search for t:Scene in the
-    Project tab, select all, and drag all scenes into Scenes in Build.'
+  m_Text: "Air tap a scene to load it.\nWhen finished with a scene, say \"Scene Launcher\"\nor
+    press the Backspace key to return the this scene list.\n\nEdit the scenes in this
+    list in Unity > File > Build Settings > Scenes in Build.\n\nIf you would like
+    to use all scenes in the project, search for t:Scene in the \nProject tab, select
+    all, and drag all scenes into Scenes in Build.\n\nAfter adding scenes to the build,
+    you can use the Scene Mapping setting\nin the SceneLauncher prefab to control
+    which scenes are included or not\nincluded in the SceneLauncher menu."
   m_OffsetZ: 0
   m_CharacterSize: 1
   m_LineSpacing: 1
-  m_Anchor: 4
+  m_Anchor: 0
   m_Alignment: 0
   m_TabSize: 4
   m_FontSize: 32
@@ -298,7 +294,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Keywords:
-  - Keyword: Scene Loader
+  - Keyword: Scene Launcher
     Response:
       m_PersistentCalls:
         m_Calls: