diff --git a/.gitignore b/.gitignore index 2eeedb78d..67d1858ce 100644 --- a/.gitignore +++ b/.gitignore @@ -78,4 +78,8 @@ crashlytics-build.properties *.zip .DS_Store /Assets/Ultimate Replay 2.0 -/Assets/Oculus \ No newline at end of file +/Assets/Oculus +/Assets/Rerun + +# Vscode files +.vscode/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 8847f66b9..7e8ad0747 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,4 @@ [submodule "Assets/Rerun"] path = Assets/Rerun url = https://github.com/FAR-Lab/Rerun.git - update = merge -[submodule "Assets/Components/StrangeTown"] - path = Assets/Components/StrangeTown - url = https://github.com/FAR-Lab/StrangeTown.git + update = merge \ No newline at end of file diff --git a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml index 602f88755..0c35c7f9e 100644 --- a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml +++ b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml @@ -10,15 +10,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + - - - - - + - + + + + + + + + + +