Merge pull request #48 from hackerspace-ntnu/develop

Develop to Main
hackerspace-ntnu · Oct 10, 2021 · 0669da7 · 0669da7
2 parents 06df9ac + ca38d74
commit 0669da7
Show file tree

Hide file tree

Showing 679 changed files with 228,228 additions and 410 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -21,4 +21,6 @@
 
 # Other binary formats
 *.dll filter=lfs diff=lfs merge=lfs -text
-* text = auto
+
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -68,4 +68,13 @@ crashlytics-build.properties
 
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
-/[Aa]ssets/[Ss]treamingAssets/aa/*
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+
+#
+# Custom patterns
+#
+.idea/
+.vsconfig
+
+*.blend1
+*.blend1.meta
diff --git a/Assets/Animations/Base.meta b/Assets/Animations/Base.meta