|
@@ -22,11 +22,20 @@
|
|
|
<select />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="More logging">
|
|
|
+ <list default="true" id="ae9d46da-fd77-45ea-9287-d8d155f44bcf" name="Default Changelist" comment="">
|
|
|
+ <change afterPath="$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMetaTag.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.VRCyling/.idea/contentModel.xml" afterDir="false" />
|
|
|
+ <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.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Prefabs/Roads/Road_Straight_With_Sidewalk.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Roads/Road_Straight_With_Sidewalk.prefab" 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/Logging/Events/RouteEventLogger.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Logging/Events/RouteEventLogger.cs" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Scripts/SlopeCollider.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SlopeCollider.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache" 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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/obj/Debug/SteamVR_Windows_EditorHelper.csprojAssemblyReference.cache" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -37,9 +46,11 @@
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="HighlightingSettingsPerFile">
|
|
|
+ <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/FAA55637-FCC1-4BBF-B146-E6835A4641D9/e7/bf98a196/RaycastHit.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/9577AC7A-62EF-4317-9789-031239BA8798/f4/58c7cb9b/ExceptionDispatchInfo.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/3AD0CC86-8BE6-42AC-8D0C-22906BB12DDB/2/Observable.Extensions.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/D6D3AC03-BF86-4882-89C2-EBF3A45CE0A1/f1/98d7e3b9/IObservable`1.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="file://$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMetaTag.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Animation/BikeAnimation.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/3AD0CC86-8BE6-42AC-8D0C-22906BB12DDB/36/BehaviorSubject.cs" root0="SKIP_HIGHLIGHTING" />
|
|
@@ -47,10 +58,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/Tracking/KineticLegTracker.cs" />
|
|
|
- <option value="$PROJECT_DIR$/Assets/Editor/CalibratableTrackerEditor.cs" />
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/Display/ViveTrackerDebugDisplay.cs" />
|
|
|
- <option value="$PROJECT_DIR$/Assets/Scripts/Controller/Bicycle/IBicycleController.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Controller/Bicycle/RbBicycleController.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Plotting/PlotFileWriter.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Plotting/AsyncLogFileWriter.cs" />
|
|
@@ -98,6 +105,10 @@
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Routes/Turn.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Roads/StraightRoadExtras.cs" />
|
|
|
<option value="$PROJECT_DIR$/Assets/Scripts/Logging/Events/RouteEventLogger.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/StreetPartMeta.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMeta.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/Roads/StreetPartMetaTag.cs" />
|
|
|
+ <option value="$PROJECT_DIR$/Assets/Scripts/SlopeCollider.cs" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -159,7 +170,8 @@
|
|
|
<workItem from="1608626823380" duration="6475000" />
|
|
|
<workItem from="1608633384360" duration="3597000" />
|
|
|
<workItem from="1609928644105" duration="6587000" />
|
|
|
- <workItem from="1610355346577" duration="6369000" />
|
|
|
+ <workItem from="1610355346577" duration="15843000" />
|
|
|
+ <workItem from="1610431786853" duration="1170000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="VR Stuff, Bicycle Animations">
|
|
|
<created>1606399745852</created>
|
|
@@ -224,7 +236,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1610361817557</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="10" />
|
|
|
+ <task id="LOCAL-00010" summary="Start and Finish events">
|
|
|
+ <created>1610362454731</created>
|
|
|
+ <option name="number" value="00010" />
|
|
|
+ <option name="presentableId" value="LOCAL-00010" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1610362454731</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="11" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -255,7 +274,8 @@
|
|
|
<MESSAGE value="Proper steering calculation" />
|
|
|
<MESSAGE value="HMD logging" />
|
|
|
<MESSAGE value="More logging" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="More logging" />
|
|
|
+ <MESSAGE value="Start and Finish events" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="Start and Finish events" />
|
|
|
</component>
|
|
|
<component name="WindowStateProjectService">
|
|
|
<state x="188" y="243" key="#xdebugger.evaluate" timestamp="1608637186447">
|
|
@@ -374,16 +394,16 @@
|
|
|
</state>
|
|
|
<state x="346" y="136" key="SettingsEditor/0.0.1440.860@0.0.1440.860" timestamp="1608627211813" />
|
|
|
<state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1607347297764" />
|
|
|
- <state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog" timestamp="1610361149716">
|
|
|
+ <state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog" timestamp="1610365025117">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
- <state x="69" y="76" width="1302" height="708" key="VCS.FileHistoryDialog/0.0.1440.860@0.0.1440.860" timestamp="1610361149716" />
|
|
|
+ <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="92" y="92" width="1736" height="856" key="VCS.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1607591027227" />
|
|
|
- <state x="414" y="208" key="Vcs.Push.Dialog.v2" timestamp="1610361819306">
|
|
|
+ <state x="414" y="208" key="Vcs.Push.Dialog.v2" timestamp="1610362459013">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
- <state x="414" y="208" key="Vcs.Push.Dialog.v2/0.0.1440.860@0.0.1440.860" timestamp="1610361819306" />
|
|
|
+ <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="1607593425704" />
|
|
|
<state width="726" height="436" key="XDebugger.FullValuePopup" timestamp="1608570184149">
|
|
@@ -394,22 +414,27 @@
|
|
|
<screen x="0" y="0" width="1440" height="900" />
|
|
|
</state>
|
|
|
<state x="93" y="93" width="1253" height="713" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608634708861" />
|
|
|
- <state x="93" y="93" width="1253" height="713" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog" timestamp="1608633349176">
|
|
|
- <screen x="0" y="0" width="1440" height="900" />
|
|
|
+ <state x="93" y="89" width="1253" height="682" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog" timestamp="1610375404608">
|
|
|
+ <screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
+ <state x="93" y="89" width="1253" height="682" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog/0.0.1440.860@0.0.1440.860" timestamp="1610375404608" />
|
|
|
<state x="93" y="93" width="1253" height="713" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog/0.0.1440.900@0.0.1440.900" timestamp="1608633349176" />
|
|
|
<state x="332" y="41" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1610362264361">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
<state x="332" y="41" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1440.860@0.0.1440.860" timestamp="1610362264361" />
|
|
|
- <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension" timestamp="1610361477789">
|
|
|
+ <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension" timestamp="1610362422263">
|
|
|
+ <screen x="0" y="0" width="1440" height="860" />
|
|
|
+ </state>
|
|
|
+ <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension/0.0.1440.860@0.0.1440.860" timestamp="1610362422263" />
|
|
|
+ <state x="368" y="29" width="703" height="801" key="find.popup" timestamp="1610363676930">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
- <state x="300" y="85" width="1140" height="689" key="editAsTableFormatDialogDimension/0.0.1440.860@0.0.1440.860" timestamp="1610361477789" />
|
|
|
- <state x="368" y="29" width="703" height="801" key="find.popup" timestamp="1610358088077">
|
|
|
+ <state x="368" y="29" width="703" height="801" key="find.popup/0.0.1440.860@0.0.1440.860" timestamp="1610363676930" />
|
|
|
+ <state x="379" y="197" key="run.anything.popup" timestamp="1610374243030">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|
|
|
- <state x="368" y="29" width="703" height="801" key="find.popup/0.0.1440.860@0.0.1440.860" timestamp="1610358088077" />
|
|
|
+ <state x="379" y="197" key="run.anything.popup/0.0.1440.860@0.0.1440.860" timestamp="1610374243030" />
|
|
|
<state x="478" y="197" width="672" height="561" key="search.everywhere.popup" timestamp="1610362007792">
|
|
|
<screen x="0" y="0" width="1440" height="860" />
|
|
|
</state>
|