GVR Unity SDK v1.20.0

googlevr · Feb 2, 2017 · 8fa2452 · 8fa2452
1 parent 7daef33
commit 8fa2452
Show file tree

Hide file tree

Showing 79 changed files with 14,050 additions and 2,621 deletions.
diff --git a/GoogleVR/Demos/Editor/DemoInputManagerEditor.cs b/GoogleVR/Demos/Editor/DemoInputManagerEditor.cs
@@ -37,7 +37,6 @@ void OnEnable () {
 
   public override void OnInspectorGUI() {
     // Platform emulation tweaking does not apply on non-native integration versions of Unity.
-    DemoInputManager myTarget = (DemoInputManager) target;
     serializedObject.Update();
 
     EditorGUILayout.PropertyField(gvrControllerMainProp);

diff --git a/GoogleVR/Demos/Images/ScrollingUIDemo/Beach_yellow.psd b/GoogleVR/Demos/Images/ScrollingUIDemo/Beach_yellow.psd
diff --git a/GoogleVR/Demos/Images/ScrollingUIDemo/ScrollBarImage.png b/GoogleVR/Demos/Images/ScrollingUIDemo/ScrollBarImage.png
diff --git a/GoogleVR/Demos/Prefabs/DemoInputManager.prefab b/GoogleVR/Demos/Prefabs/DemoInputManager.prefab
@@ -44,7 +44,6 @@ GameObject:
   - 224: {fileID: 22484034}
   - 223: {fileID: 22358712}
   - 114: {fileID: 11424358}
-  - 114: {fileID: 11417076}
   m_Layer: 5
   m_Name: MessageCanvas
   m_TagString: Untagged
@@ -82,22 +81,6 @@ Transform:
   - {fileID: 22484034}
   m_Father: {fileID: 0}
   m_RootOrder: 0
---- !u!114 &11417076
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 162814}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!114 &11424358
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -271,8 +254,8 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 162814}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 3.82}
-  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_LocalPosition: {x: 0, y: 0, z: 2.5}
+  m_LocalScale: {x: 0.0065, y: 0.0065, z: 0.01}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 22450954}