Merge branch 'master' into reflexion-improvement

uni-bremen-agst · Sep 30, 2024 · ffcf3d9 · ffcf3d9
2 parents cd8db19 + 1adb5b0
commit ffcf3d9
Show file tree

Hide file tree

Showing 115 changed files with 1,811 additions and 238 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -36,3 +36,4 @@ Assets/Plugins/CC_Unity_Tools/** filter=lfs diff=lfs merge=lfs -text
 Assets/Plugins/CC_Unity_Tools.meta filter=lfs diff=lfs merge=lfs -text
 Assets/Resources/Materials/CC4/** filter=lfs diff=lfs merge=lfs -text
 Assets/Resources/Materials/CC4.meta filter=lfs diff=lfs merge=lfs -text
+Assets/StreamingAssets/HelpSystem/Videos/** filter=lfs diff=lfs merge=lfs -text
diff --git a/Assets/Plugins/ShaderControl/Editor/Resources/BuiltShaders.asset b/Assets/Plugins/ShaderControl/Editor/Resources/BuiltShaders.asset