cmidkiff/FittsLaw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
Chris Midkiff 2018-10-14 19:59:15 -04:00
parent a4b72a33f4
commit 1097262dae
3 changed files with 46 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/GoogleVR/GVRVideoPlayer.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 39850532bc74a4078a24832112e8aef3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GoogleVR/Scripts/InstantPreview/InstantPreview.apk.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dc278786e6540af428ccbf7825495004
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

122
Assets/Scenes/Experiment-Oculus.unity
View File

@ -214,8 +214,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -249,7 +249,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -417,7 +417,6 @@ CircleCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
<<<<<<< HEAD
m_Radius: 0.1
--- !u!114 &150834722
MonoBehaviour:
@ -428,8 +427,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -463,7 +462,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -517,60 +516,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5ec14cccdc625049a7deb31b2b0aa76, type: 3}
m_Name:
m_EditorClassIdentifier:
=======
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
propertyPath: m_LocalPosition.z
value: -6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
m_IsPrefabAsset: 0
>>>>>>> 5d0857d75672407557626a26bd2f3f0a042f1872
m_Name:
m_EditorClassIdentifier:
--- !u!1 &409506796
GameObject:
m_ObjectHideFlags: 0
@ -672,8 +619,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -707,7 +654,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -819,8 +766,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -854,7 +801,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -966,8 +913,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -1001,7 +948,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -1093,13 +1040,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 534664144}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 1.3059263, y: 0.32, z: 15.21}
m_LocalScale: {x: 1, y: 1, z: 1}
=======
m_LocalPosition: {x: 0, y: 0, z: -6}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
>>>>>>> 5d0857d75672407557626a26bd2f3f0a042f1872
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
@ -1190,8 +1132,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -1225,7 +1167,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -1357,8 +1299,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 1759931873}
primaryButton: 8192
secondaryButton: 1024
@ -1392,7 +1334,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -1570,8 +1512,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -1605,7 +1547,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -1717,8 +1659,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -1752,7 +1694,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,
@ -1864,8 +1806,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472cd28b041d447a4b0f2b5c603034aa, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
trackingSpace: {fileID: 0}
primaryButton: 8192
secondaryButton: 1024
@ -1899,7 +1841,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: ControllerSelection.OVRRawRaycaster+SelectionCallback, Assembly-CSharp,