Marcel Zickler 3 years ago
parent
commit
98f60664a0

+ 0 - 1
.idea/.idea.VR Cycling/.idea/indexLayout.xml

@@ -31,7 +31,6 @@
       <Path>Integrations</Path>
       <Path>Library</Path>
       <Path>Logs</Path>
-      <Path>Temp</Path>
       <Path>UserSettings</Path>
       <Path>obj</Path>
     </explicitExcludes>

+ 1 - 1
Assets/NuGet.config.meta

@@ -25,7 +25,7 @@ PluginImporter:
   - first:
       Windows Store Apps: WindowsStoreApps
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
   userData: 
   assetBundleName: 

+ 66 - 154
Assets/Scenes/MainScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.28462106, g: 0.37120986, b: 0.4988058, a: 1}
+  m_IndirectSpecularColor: {r: 0.2846213, g: 0.37121028, b: 0.49880686, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -11856,7 +11856,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 51470641}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9a5fb0ca93b55ef4b8d54b512b103341, type: 3}
   m_Name: 
@@ -18419,13 +18419,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 75991581}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9a5fb0ca93b55ef4b8d54b512b103341, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   poseAction:
-    actionPath: /actions/bikevr/in/Pose
+    actionPath: /actions/default/in/Pose
     needsReinit: 0
   inputSource: 3
   origin: {fileID: 0}
@@ -31623,11 +31623,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 451871745638313690, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 451871745638313693, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
         type: 3}
       propertyPath: m_Name
@@ -54352,18 +54347,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 221150437}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &221634808 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1929101100484375460, guid: f1b4cbd2f891a5c46aedca9958dc3ed1,
-    type: 3}
-  m_PrefabInstance: {fileID: 1216320328}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ad8f054f47e6472581c773771c181bc4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &221721682
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -58057,25 +58040,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a8075fecadfce7c4abe277fb835ca5c5, type: 3}
---- !u!1 &240777121 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1929752190}
-  m_PrefabAsset: {fileID: 0}
---- !u!65 &240777123
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 240777121}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 0.62, y: 1.98, z: 3.27}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &241162617
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -58844,31 +58808,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0edb99d48e914465a069ad6898236082, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  items:
-  - turn: {fileID: 624357439}
-    from: 4
-    to: 2
-  - turn: {fileID: 18472990}
-    from: 0
-    to: 2
-  - turn: {fileID: 1248160490}
-    from: 0
-    to: 2
-  - turn: {fileID: 2014780535}
-    from: 0
-    to: 2
-  - turn: {fileID: 1812833148}
-    from: 0
-    to: 2
-  - turn: {fileID: 418869658}
-    from: 0
-    to: 2
-  - turn: {fileID: 718213689}
-    from: 0
-    to: 2
-  - turn: {fileID: 221634808}
-    from: 0
-    to: 4
+  items: []
   start: {fileID: 0}
   finish: {fileID: 0}
 --- !u!1001 &245939337
@@ -104594,18 +104534,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2131646112}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &418869658 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1929101100484375460, guid: f1b4cbd2f891a5c46aedca9958dc3ed1,
-    type: 3}
-  m_PrefabInstance: {fileID: 775767391}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ad8f054f47e6472581c773771c181bc4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &418878620 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1121772855208284805, guid: a8075fecadfce7c4abe277fb835ca5c5,
@@ -175726,18 +175654,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 33b36afb51822b442b3a3f8accf3c199, type: 3}
---- !u!114 &718213689 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1355098184}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &718531847
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -266176,8 +266092,8 @@ MonoBehaviour:
       colorBlindnessType: 0
       colorBlindnessStrength: 1
   m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 1
-  m_ShowCustomSorter: 1
+  m_ShowToolkit: 0
+  m_ShowCustomSorter: 0
   breakBeforeColorGrading: 0
   m_BeforeTransparentBundles: []
   m_BeforeStackBundles: []
@@ -296852,6 +296768,49 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1249320707}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1250245978
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1250245980}
+  - component: {fileID: 1250245979}
+  m_Layer: 0
+  m_Name: ESPController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1250245979
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1250245978}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb93607a6cb942fb953b309e1b8f788e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1250245980
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1250245978}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1250389563
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -425414,18 +425373,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1812629540}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1812833148 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
-    type: 3}
-  m_PrefabInstance: {fileID: 298287648}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1812868907
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -453894,9 +453841,9 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1454561111988264472, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+    - target: {fileID: 2731252534111432329, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
-      propertyPath: calibrateOnStart
+      propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
@@ -453907,12 +453854,12 @@ PrefabInstance:
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: maxLeaningAngle
-      value: 35
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: maxSteeringAngle
-      value: 80
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 3450098086302837850, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -453939,21 +453886,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.y
       value: -0.953
       objectReference: {fileID: 0}
-    - target: {fileID: 4426752443652901415, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: m_IsTrigger
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4947603828939169604, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: actionSet.actionSetPath
-      value: /actions/bikevr
-      objectReference: {fileID: 0}
-    - target: {fileID: 4947603828939169604, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: disableAllOtherActionSets
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 4986149865694756146, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_RootOrder
@@ -454127,7 +454059,7 @@ PrefabInstance:
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: steer
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454147,7 +454079,7 @@ PrefabInstance:
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: accelerate
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319894, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454167,7 +454099,7 @@ PrefabInstance:
     - target: {fileID: 4988978072042319979, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319980, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454569,7 +454501,7 @@ PrefabInstance:
     - target: {fileID: 4988978073311274404, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4988978073311274404, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454736,25 +454668,15 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 9
       objectReference: {fileID: 0}
-    - target: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: m_TagString
-      value: bike
-      objectReference: {fileID: 0}
-    - target: {fileID: 5438041363405718847, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 5448601093364272614, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: index
-      value: 6
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 5448601093364272614, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5804818527648747315, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454799,7 +454721,7 @@ PrefabInstance:
     - target: {fileID: 7596273975278892917, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7596273975278892917, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454819,12 +454741,12 @@ PrefabInstance:
     - target: {fileID: 8820983990824272404, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: index
-      value: 5
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8820983990824272404, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9182195524616384860, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -454837,7 +454759,9 @@ PrefabInstance:
       value: KineticLegTracker
       objectReference: {fileID: 0}
     m_RemovedComponents:
-    - {fileID: 4988978072042319894, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
+    - {fileID: 6996791244483053872, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
+    - {fileID: 4988978073311274400, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
+    - {fileID: 2731252534111432329, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 3b07d6594636ab04d9c1fac04c1cde7e, type: 3}
 --- !u!1001 &1930089593
 PrefabInstance:
@@ -473561,18 +473485,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2014754307}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &2014780535 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5908241662424435614, guid: 8b8f51b9ab677d14789d28c0522c7e4c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1851158714}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7bc613422f424ecbab70286630638b48, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &2015159758
 PrefabInstance:
   m_ObjectHideFlags: 0

BIN
obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache