|
@@ -22,17 +22,15 @@
|
|
|
<select />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="WIP: slope adjustment">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" afterDir="false" />
|
|
|
+ <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="ipd stuff">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/indexLayout.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Materials/Vignette.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/Vignette.mat" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/MainScene.unity" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/SteamVR.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR.csproj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/SteamVR_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Editor.csproj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/SteamVR_Input_Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Input_Editor.csproj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/SteamVR_Windows_EditorHelper.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/SteamVR_Windows_EditorHelper.csproj" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/DynamicReductionSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/DynamicReductionSource.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/FanController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/FanController.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -47,6 +45,9 @@
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/SteamVR/Plugins/openvr_api.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Wheels/SwitchColliderOnStanding.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
+ <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/1A3A5801-6E2C-4FF1-B975-52B718793608/5a/7e36ae17/DepthOfField.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.valvesoftware.unity.openvr@e340bc848225-1611139568890/Runtime/openvr_api.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.universal@8.2.0/Runtime/ScriptableRendererData.cs" root0="SKIP_HIGHLIGHTING" />
|
|
@@ -56,6 +57,7 @@
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/62FFEEB7-EC02-4BEA-B61E-5FBF8D44AC5B/e2/54e16cc4/Math.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Animation/BikeAnimation.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.inputsystem@1.0.1/InputSystem/Utilities/PrimitiveValue.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/1A3A5801-6E2C-4FF1-B975-52B718793608/65/0ec761f4/DepthOfFieldModeParameter.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/F352B6B8-9F0F-458F-8952-E62C7DE1DBFE/f4/b5ba078b/VolumeParameter`1.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" root0="FORCE_HIGHLIGHTING" />
|
|
@@ -63,8 +65,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/BikeGameObjectDataLogger.cs" />
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/BikeSensorDataLogger.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/PolarAccDataLogger.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/PolarEcgDataLogger.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Logging/Data/SensorDataLogger.cs" />
|
|
@@ -105,7 +105,6 @@
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Controller/Bicycle/IBicycleController.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Tracking/CameraTracker.cs" />
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Tracking/IdentifyTrackers.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Tracking/IViveTracker.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Tracking/FrontWheelTracker.cs" />
|
|
@@ -114,6 +113,9 @@
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/IpdInfo.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Controller/Bicycle/RbBicycleController.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/FanController.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/DynamicReductionSource.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Haptic/VibrationController.cs" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -138,10 +140,10 @@
|
|
|
<property name="vue.rearranger.settings.migration" value="true" />
|
|
|
</component>
|
|
|
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor & Play">
|
|
|
- <configuration name="Attach to Unity Editor & Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="59256">
|
|
|
+ <configuration name="Attach to Unity Editor & Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="20716">
|
|
|
<option name="allowRunningInParallel" value="false" />
|
|
|
<option name="listenPortForConnections" value="false" />
|
|
|
- <option name="pid" value="59256" />
|
|
|
+ <option name="pid" value="20716" />
|
|
|
<option name="selectedOptions">
|
|
|
<set />
|
|
|
</option>
|
|
@@ -191,7 +193,8 @@
|
|
|
<workItem from="1616403254170" duration="2841000" />
|
|
|
<workItem from="1616484098735" duration="5506000" />
|
|
|
<workItem from="1616600379396" duration="1501000" />
|
|
|
- <workItem from="1617013015246" duration="1500000" />
|
|
|
+ <workItem from="1617013015246" duration="1521000" />
|
|
|
+ <workItem from="1617088014991" duration="3749000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
|
|
|
<created>1606399745852</created>
|
|
@@ -333,7 +336,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1616604309315</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="21" />
|
|
|
+ <task id="LOCAL-00021" summary="ipd stuff">
|
|
|
+ <created>1617014532531</created>
|
|
|
+ <option name="number" value="00021" />
|
|
|
+ <option name="presentableId" value="LOCAL-00021" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1617014532531</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="22" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -375,7 +385,8 @@
|
|
|
<MESSAGE value="Automatic tracker indeces" />
|
|
|
<MESSAGE value="WIP: consider IPD for virtual noses" />
|
|
|
<MESSAGE value="WIP: slope adjustment" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="WIP: slope adjustment" />
|
|
|
+ <MESSAGE value="ipd stuff" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="ipd stuff" />
|
|
|
</component>
|
|
|
<component name="WindowStateProjectService">
|
|
|
<state x="704" y="291" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1612943194023">
|
|
@@ -387,115 +398,123 @@
|
|
|
</state>
|
|
|
<state x="476" y="134" key="#xdebugger.evaluate/0.0.1440.860@0.0.1440.860" timestamp="1608570995081" />
|
|
|
<state x="188" y="243" key="#xdebugger.evaluate/0.0.1440.900@0.0.1440.900" timestamp="1608637186447" />
|
|
|
- <state width="680" height="497" key="DebuggerActiveHint" timestamp="1611319259442">
|
|
|
+ <state width="680" height="497" key="DebuggerActiveHint" timestamp="1617090082962">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="478" height="402" key="DebuggerActiveHint/0.0.1440.900@0.0.1440.900" timestamp="1608636244835" />
|
|
|
- <state width="680" height="497" key="DebuggerActiveHint/0.0.2048.1112@0.0.2048.1112" timestamp="1611319259442" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.bottom" timestamp="1617013441841">
|
|
|
+ <state width="680" height="497" key="DebuggerActiveHint/0.0.2048.1112@0.0.2048.1112" timestamp="1617090082962" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.bottom" timestamp="1617090193634">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.0.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.0.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449594" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617013441841" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.center" timestamp="1617013441841">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193634" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.center" timestamp="1617090193634">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.0.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.0.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449593" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617013441841" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.left" timestamp="1617013441841">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193634" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.left" timestamp="1617090193634">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.0.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659056" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.0.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304835" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449593" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617013441841" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.right" timestamp="1617013441841">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193634" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.right" timestamp="1617090193634">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.0.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.0.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1610538449594" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.0.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617013441841" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.bottom" timestamp="1617013451137">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.0.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193634" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.bottom" timestamp="1617090193458">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.1.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.1.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617013451137" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.center" timestamp="1617013451136">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.center" timestamp="1617090193458">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.1.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.1.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617013451136" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.left" timestamp="1617013451136">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.left" timestamp="1617090193458">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.1.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659057" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.1.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304836" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457609" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617013451136" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.right" timestamp="1617013451136">
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.right" timestamp="1617090193458">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.1.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.1.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1610538457610" />
|
|
|
- <state width="1002" height="414" key="GridCell.Tab.1.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617013451136" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.2.bottom" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.1.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.bottom" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.2.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.2.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304839" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.2.center" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.center" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.2.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.2.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304838" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.2.left" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.left" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.2.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659058" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.2.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304837" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.2.right" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.right" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.2.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.2.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304838" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.3.bottom" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.2.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.bottom" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.3.bottom/0.0.1440.860@0.0.1440.860" timestamp="1608571659060" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.3.bottom/0.0.1440.900@0.0.1440.900" timestamp="1608637304840" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.3.center" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.center" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.3.center/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.3.center/0.0.1440.900@0.0.1440.900" timestamp="1608637304839" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.3.left" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.center/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.left" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.3.left/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.3.left/0.0.1440.900@0.0.1440.900" timestamp="1608637304839" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
- <state width="1877" height="385" key="GridCell.Tab.3.right" timestamp="1609933996568">
|
|
|
- <screen x="0" y="0" width="1920" height="1040" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.left/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.right" timestamp="1617090193458">
|
|
|
+ <screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state width="1398" height="278" key="GridCell.Tab.3.right/0.0.1440.860@0.0.1440.860" timestamp="1608571659059" />
|
|
|
<state width="1398" height="320" key="GridCell.Tab.3.right/0.0.1440.900@0.0.1440.900" timestamp="1608637304839" />
|
|
|
<state width="1877" height="385" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1609933996568" />
|
|
|
+ <state width="1002" height="414" key="GridCell.Tab.3.right/0.0.2048.1112@0.0.2048.1112" timestamp="1617090193458" />
|
|
|
<state x="662" y="317" key="MultipleFileMergeDialog" timestamp="1612528086834">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
@@ -515,13 +534,13 @@
|
|
|
<state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog/0.0.1440.860@0.0.1440.860" timestamp="1610365025117" />
|
|
|
<state x="69" y="80" width="1302" height="741" key="VCS.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608635342446" />
|
|
|
<state x="98" y="98" width="1852" height="916" key="VCS.FileHistoryDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1615979704751" />
|
|
|
- <state x="589" y="269" key="Vcs.Push.Dialog.v2" timestamp="1616604399306">
|
|
|
+ <state x="589" y="269" key="Vcs.Push.Dialog.v2" timestamp="1617014534110">
|
|
|
<screen x="0" y="0" width="2048" height="1112" />
|
|
|
</state>
|
|
|
<state x="414" y="208" key="Vcs.Push.Dialog.v2/0.0.1440.860@0.0.1440.860" timestamp="1610362459013" />
|
|
|
<state x="414" y="218" key="Vcs.Push.Dialog.v2/0.0.1440.900@0.0.1440.900" timestamp="1608628624093" />
|
|
|
<state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1610531923390" />
|
|
|
- <state x="589" y="269" key="Vcs.Push.Dialog.v2/0.0.2048.1112@0.0.2048.1112" timestamp="1616604399306" />
|
|
|
+ <state x="589" y="269" key="Vcs.Push.Dialog.v2/0.0.2048.1112@0.0.2048.1112" timestamp="1617014534110" />
|
|
|
<state width="726" height="436" key="XDebugger.FullValuePopup" timestamp="1608570184149">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
@@ -610,17 +629,30 @@
|
|
|
<option name="timeStamp" value="23" />
|
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
- <url>file://$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/VirtualNose.cs</url>
|
|
|
- <line>45</line>
|
|
|
- <properties documentPath="C:\Users\student\Desktop\VRCyling\Assets\Scripts\SicknessReduction\Visual\VirtualNose.cs" initialLine="42">
|
|
|
+ <url>file://$PROJECT_DIR$/Assets/Scripts/SicknessReduction/DynamicReductionSource.cs</url>
|
|
|
+ <line>63</line>
|
|
|
+ <properties documentPath="C:\Users\student\Desktop\VRCyling\Assets\Scripts\SicknessReduction\DynamicReductionSource.cs" initialLine="63">
|
|
|
+ <startOffsets>
|
|
|
+ <option value="2181" />
|
|
|
+ </startOffsets>
|
|
|
+ <endOffsets>
|
|
|
+ <option value="2268" />
|
|
|
+ </endOffsets>
|
|
|
+ </properties>
|
|
|
+ <option name="timeStamp" value="26" />
|
|
|
+ </line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
+ <url>file://$PROJECT_DIR$/Assets/Scripts/SicknessReduction/Visual/Vignetting/RestrictionSuggestor.cs</url>
|
|
|
+ <line>70</line>
|
|
|
+ <properties documentPath="C:\Users\student\Desktop\VRCyling\Assets\Scripts\SicknessReduction\Visual\Vignetting\RestrictionSuggestor.cs" initialLine="70">
|
|
|
<startOffsets>
|
|
|
- <option value="1349" />
|
|
|
+ <option value="2212" />
|
|
|
</startOffsets>
|
|
|
<endOffsets>
|
|
|
- <option value="1423" />
|
|
|
+ <option value="2243" />
|
|
|
</endOffsets>
|
|
|
</properties>
|
|
|
- <option name="timeStamp" value="24" />
|
|
|
+ <option name="timeStamp" value="27" />
|
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
@@ -637,6 +669,10 @@
|
|
|
<watch expression="typeof(BikeSensorDataLog).GetFields(BindingFlags.Instance | BindingFlags.NonPublic)" language="C#" />
|
|
|
<watch expression="value.GetType().GetFields(BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.GetField | BindingFlags.DeclaredOnly)" language="C#" />
|
|
|
<watch expression="HeaderNames" language="C#" />
|
|
|
+ <watch expression="angularVelocitySuggestor" language="C#" />
|
|
|
+ <watch expression="bikeController" language="C#" />
|
|
|
+ <watch expression="bikeController.rigidBody" language="C#" />
|
|
|
+ <watch expression="bikeController.rigidBody.transform" language="C#" />
|
|
|
</configuration>
|
|
|
</watches-manager>
|
|
|
</component>
|