Merge pull request #529 from Unity-Technologies/staging

0.2 staging -> master

.gitattributes

@@ -27,3 +27,4 @@
 *.wav	filter=lfs diff=lfs merge=lfs -crlf
 *.zip	filter=lfs diff=lfs merge=lfs -crlf
 *.lfs.*	filter=lfs diff=lfs merge=lfs -crlf
+*.unitypackage	filter=lfs diff=lfs merge=lfs -crlf

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+### Purpose of this PR
+
+[Desc of feature/change. Links to screenshots, design docs, user docs, etc. Remember reviewers may be outside your team, and not know your feature/area that should be explained more.]
+
+### Testing status
+
+[Explanation of what’s tested, how tested and existing or new automation tests. Can include manual testing by self and/or QA. Specify test plans. Rarely acceptable to have no testing.]
+
+### Technical risk
+
+[Overall product level assessment of risk of change. Need technical risk & halo effect.]
+
+### Comments to reviewers
+
+[Info per person for what to focus on, or historical info to understand who have previously reviewed and coverage. Help them get context.]

Actions/BaseAction.cs

@@ -1,5 +1,4 @@
-#if UNITY_EDITOR
-using UnityEngine;
+using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
@@ -19,4 +18,3 @@ public Sprite icon
         public abstract void ExecuteAction();
     }
 }
-#endif

Actions/Copy.cs

@@ -1,14 +1,15 @@
-#if UNITY_EDITOR
-namespace UnityEditor.Experimental.EditorVR.Actions
+namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)]
+    [SpatialMenuItem("Copy", "Actions", "Copy the selected object")]
     sealed class Copy : BaseAction
     {
         public override void ExecuteAction()
         {
+#if UNITY_EDITOR
             Unsupported.CopyGameObjectsToPasteboard();
+#endif
             Paste.SetBufferDistance(Selection.transforms);
         }
     }
 }
-#endif

Actions/Cut.cs

@@ -1,23 +1,25 @@
-#if UNITY_EDITOR
-using UnityEngine;
+using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Cut", ActionMenuItemAttribute.DefaultActionSectionName, 4)]
+    [SpatialMenuItem("Cut", "Actions", "Cut the selected object")]
     sealed class Cut : BaseAction
     {
         public override void ExecuteAction()
         {
             var selection = Selection.transforms;
             if (selection != null)
             {
+#if UNITY_EDITOR
                 Unsupported.CopyGameObjectsToPasteboard();
+#endif
                 Paste.SetBufferDistance(Selection.transforms);
 
                 foreach (var transform in selection)
                 {
                     var go = transform.gameObject;
-                    go.hideFlags = HideFlags.HideAndDontSave;
+                    go.hideFlags = HideFlags.HideInHierarchy | HideFlags.DontSaveInEditor;
                     go.SetActive(false);
                 }
 
@@ -26,4 +28,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/Delete.cs

@@ -1,10 +1,10 @@
-#if UNITY_EDITOR
-using System;
+using System;
 using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Delete", ActionMenuItemAttribute.DefaultActionSectionName, 7)]
+    [SpatialMenuItem("Delete", "Actions", "Delete the selected object")]
     sealed class Delete : BaseAction, IDeleteSceneObject
     {
         public Action<GameObject> addToSpatialHash { private get; set; }
@@ -18,10 +18,11 @@ public override void ExecuteAction()
                 this.DeleteSceneObject(go);
             }
 
+#if UNITY_EDITOR
             UnityEditor.Undo.IncrementCurrentGroup();
+#endif
 
             Selection.activeGameObject = null;
         }
     }
 }
-#endif

Actions/Duplicate.cs

@@ -1,15 +1,17 @@
-#if UNITY_EDITOR
-using UnityEditor.Experimental.EditorVR.Utilities;
+using UnityEditor.Experimental.EditorVR.Utilities;
 using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Duplicate", ActionMenuItemAttribute.DefaultActionSectionName, 3)]
+    [SpatialMenuItem("Duplicate", "Actions", "Duplicate the selected object at the currently focused position")]
     sealed class Duplicate : BaseAction, IUsesSpatialHash, IUsesViewerScale
     {
         public override void ExecuteAction()
         {
+#if UNITY_EDITOR
             Unsupported.DuplicateGameObjectsUsingPasteboard();
+#endif
             var selection = Selection.transforms;
             var bounds = ObjectUtils.GetBounds(selection);
             foreach (var s in selection)
@@ -26,4 +28,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/OpenScene.cs

@@ -1,5 +1,4 @@
-#if UNITY_EDITOR
-using UnityEngine;
+using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
@@ -12,4 +11,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/Paste.cs

@@ -1,10 +1,10 @@
-#if UNITY_EDITOR
-using UnityEditor.Experimental.EditorVR.Utilities;
+using UnityEditor.Experimental.EditorVR.Utilities;
 using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Paste", ActionMenuItemAttribute.DefaultActionSectionName, 6)]
+    [SpatialMenuItem("Paste", "Actions", "Paste a copied object")]
     sealed class Paste : BaseAction, IUsesSpatialHash, IUsesViewerScale
     {
         static float s_BufferDistance;
@@ -22,7 +22,9 @@ public static void SetBufferDistance(Transform[] transforms)
 
         public override void ExecuteAction()
         {
+#if UNITY_EDITOR
             Unsupported.PasteGameObjectsFromPasteboard();
+#endif
             var transforms = Selection.transforms;
             var bounds = ObjectUtils.GetBounds(transforms);
             foreach (var transform in transforms)
@@ -39,4 +41,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/Play.cs

@@ -1,7 +1,7 @@
-#if UNITY_EDITOR
-namespace UnityEditor.Experimental.EditorVR.Actions
+namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Play")]
+    [SpatialMenuItem("Play", "Actions", "Enter Play-Mode")]
     sealed class Play : BaseAction
     {
         public override void ExecuteAction()
@@ -12,4 +12,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/Redo.cs

@@ -1,7 +1,7 @@
-#if UNITY_EDITOR
-namespace UnityEditor.Experimental.EditorVR.Actions
+namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Redo", ActionMenuItemAttribute.DefaultActionSectionName, 1)]
+    [SpatialMenuItem("Redo", "Actions", "Redo the previously undone action")]
     sealed class Redo : BaseAction
     {
         public override void ExecuteAction()
@@ -12,4 +12,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/SaveScene.cs

@@ -1,5 +1,4 @@
-#if UNITY_EDITOR
-using UnityEngine;
+using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
@@ -12,4 +11,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/SelectParent.cs

@@ -1,7 +1,7 @@
-#if UNITY_EDITOR
-namespace UnityEditor.Experimental.EditorVR.Actions
+namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("SelectParent", ActionMenuItemAttribute.DefaultActionSectionName, 8)]
+    [SpatialMenuItem("Select Parent", "Actions", "Select the parent of the currently selected object")]
     sealed class SelectParent : BaseAction
     {
         public override void ExecuteAction()
@@ -22,4 +22,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

Actions/Undo.cs

@@ -1,7 +1,7 @@
-#if UNITY_EDITOR
-namespace UnityEditor.Experimental.EditorVR.Actions
+namespace UnityEditor.Experimental.EditorVR.Actions
 {
     [ActionMenuItem("Undo", ActionMenuItemAttribute.DefaultActionSectionName, 2)]
+    [SpatialMenuItem("Undo", "Actions", "Undo the previous action")]
     sealed class Undo : BaseAction
     {
         public override void ExecuteAction()
@@ -12,4 +12,3 @@ public override void ExecuteAction()
         }
     }
 }
-#endif

AssemblyInfo.cs

@@ -1,8 +1,9 @@
-#if UNITY_EDITOR
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 // This is necessary to allow cross-communication between assemblies for classes in the UnityEditor.Experimental.EditorVR
 // namespace; The plan is that all code will eventually be within a single assembly.
 
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]
-#endif
+[assembly: InternalsVisibleTo("EXR-Editor")]
+[assembly: InternalsVisibleTo("EXR-Tests")]
+[assembly: InternalsVisibleTo("EXR-Tests-Editor")]

EXR.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "EXR",
+    "references": [
+        "EXR-Dependencies",
+        "SteamVR",
+        "input-prototype",
+        "VRLR",
+        "Unity.TextMeshPro",
+        "PolyToolkit",
+        "Oculus.VR"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false
+}