|
@@ -7,14 +7,13 @@
|
|
|
<change beforePath="$PROJECT_DIR$/../Materials/Vignette.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Materials/Vignette.mat" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/../Scenes/MainScene.unity" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../Scripts/ConditionManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/ConditionManager.cs" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../Scripts/Tracking/MatchPlayerPositionAndCalibrate.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Tracking/MatchPlayerPositionAndCalibrate.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$/../../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/Assembly-CSharp-Editor.csprojAssemblyReference.cache" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache" beforeDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|