Merge remote-tracking branch 'origin/master' into 599-reflexion-sync-…

…edges-from-implementation-to-architecture
uni-bremen-agst · Aug 16, 2023 · a94a752 · a94a752
2 parents 0f93c7f + 77db03e
commit a94a752
Show file tree

Hide file tree

Showing 24 changed files with 877 additions and 88 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -29,4 +29,3 @@ Assets/Plugins/** filter=lfs diff=lfs merge=lfs -text
 Assets/StreamingAssets/Videos.meta filter=lfs diff=lfs merge=lfs -text
 Assets/StreamingAssets/Videos/** filter=lfs diff=lfs merge=lfs -text
 Assets/Trailer/** filter=lfs diff=lfs merge=lfs -text
-Assets/XR/** filter=lfs diff=lfs merge=lfs -text
diff --git a/Assets/Resources/Logos/SEELogo.png b/Assets/Resources/Logos/SEELogo.png
diff --git a/Assets/Resources/Logos/SEELogo.xcf b/Assets/Resources/Logos/SEELogo.xcf
diff --git a/Assets/XR/Loaders.meta b/Assets/XR/Loaders.meta
diff --git a/Assets/XR/Loaders/Open VR Loader.asset b/Assets/XR/Loaders/Open VR Loader.asset
diff --git a/Assets/XR/Loaders/Open VR Loader.asset.meta b/Assets/XR/Loaders/Open VR Loader.asset.meta
diff --git a/Assets/XR/Loaders/Open XR Loader No Pre Init.asset b/Assets/XR/Loaders/Open XR Loader No Pre Init.asset
diff --git a/Assets/XR/Loaders/Open XR Loader No Pre Init.asset.meta b/Assets/XR/Loaders/Open XR Loader No Pre Init.asset.meta
diff --git a/Assets/XR/Loaders/Open XR Loader.asset b/Assets/XR/Loaders/Open XR Loader.asset
diff --git a/Assets/XR/Loaders/Open XR Loader.asset.meta b/Assets/XR/Loaders/Open XR Loader.asset.meta
diff --git a/Assets/XR/Loaders/Windows MR Loader.asset b/Assets/XR/Loaders/Windows MR Loader.asset
diff --git a/Assets/XR/Loaders/Windows MR Loader.asset.meta b/Assets/XR/Loaders/Windows MR Loader.asset.meta
diff --git a/Assets/XR/Settings.meta b/Assets/XR/Settings.meta