Merge pull request #1528 from Microsoft/v2017.2.0.1-Stabilization

2017.2.1.0 stabilization merge into master

Author: NeerajW

.gitattributes

@@ -1,13 +1,11 @@
 *.cs text diff=csharp
-
+.gitattributes text
 *.txt text
 *.md text
 
+*.asset eol=lf
+*.controller eol=lf
 *.prefab eol=lf
 *.meta eol=lf
 *.mat eol=lf
 *.anim eol=lf
-*.controller eol=lf
-*.asset eol=lf
-
-.gitattributes text

.gitignore

@@ -11,8 +11,11 @@
 UWP/
 WindowsStoreApp/
 UnityGenerated/
+UnityPackageManager/
 project.json
 project.lock.json
+WSATestCertificate.pfx
+WSATestCertificate.pfx.meta
 
 # ===================================== #
 # Visual Studio / MonoDevelop generated #
@@ -38,5 +41,5 @@ obj/
 *.idb
 *.opendb
 
-WSATestCertificate.pfx
-WSATestCertificate.pfx.meta
+Assets/ThirdParty/
+Assets/ThirdParty.meta

Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat

@@ -7,8 +7,8 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Highlight
-  m_Shader: {fileID: 4800000, guid: f326278a838e87c499393f30a8e72127, type: 3}
-  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION
+  m_Shader: {fileID: 4800000, guid: 06790e211e4a6df409b1e04bc91c4810, type: 3}
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION _USECOLOR_ON _USEMAINTEX_ON
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -60,6 +60,8 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BumpScale: 1
+    - _ColorWriteMask: 15
+    - _Cull: 2
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
@@ -76,6 +78,9 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
+    - _UseColor: 1
+    - _UseMainTex: 1
+    - _ZTest: 4
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0.69225776, g: 0.88096607, b: 0.9705882, a: 1}

Assets/HoloToolkit-Examples/Boundary/Scenes/BoundaryTest.unity

@@ -567,7 +567,7 @@ GameObject:
   - component: {fileID: 1061324850}
   - component: {fileID: 1061324849}
   m_Layer: 0
-  m_Name: Cube_0,10,0
+  m_Name: Cube_0,11,0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -644,7 +644,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1061324848}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 10, z: 0}
+  m_LocalPosition: {x: 0, y: 11, z: 0}
   m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
   m_Children: []
   m_Father: {fileID: 0}

Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs

@@ -19,13 +19,22 @@ private void Start()
 
             if (BoundaryManager.Instance.ContainsObject(gameObject.transform.position))
             {
-                Debug.LogFormat("Object is within established boundary. Position: {0}", gameObject.transform.position);
+                Debug.LogFormat("Object {0} is within established boundary. Position: {1}", name, gameObject.transform.position);
 
                 for (int i = 0; i < defaultMaterials.Length; i++)
                 {
                     // Color the cube green if object is within specified boundary.
-                    Color highlightColor = Color.green;
-                    defaultMaterials[i].SetColor("_Color", highlightColor);
+                    defaultMaterials[i].SetColor("_Color", Color.green);
+                }
+            }
+            else
+            {
+                Debug.LogFormat("Object {0} is outside established boundary. Position: {1}", name, gameObject.transform.position);
+
+                for (int i = 0; i < defaultMaterials.Length; i++)
+                {
+                    // Color the cube red if object is outside specified boundary.
+                    defaultMaterials[i].SetColor("_Color", Color.red);
                 }
             }
 #else

Assets/HoloToolkit-Examples/FastConfigurableShader/Models/MapTest.fbx.meta

@@ -9,7 +9,7 @@
 namespace HoloToolkit.Examples.GazeRuler
 {
     /// <summary>
-    /// mananger all lines in the scene
+    /// Manages all lines in the scene
     /// </summary>
     public class LineManager : Singleton<LineManager>, IGeometry
     {