Merge pull request #13 from kurone-kito/add-the-new-parts

v0.6.0: Added the new parts
kurone-kito · Oct 27, 2024 · c4034d3 · c4034d3
2 parents 17061f3 + 59b5013
commit c4034d3
Show file tree

Hide file tree

Showing 181 changed files with 89,750 additions and 19,574 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,11 +4,11 @@
 /Packages/dev.*/** linguist-vendored
 /ProjectSettings/** linguist-vendored
 
-*.asset merge=unityyamlmerge filter=vrc eol=lf text
-*.mat merge=unityyamlmerge eol=lf text
-*.meta merge=unityyamlmerge eol=lf text
-*.prefab merge=unityyamlmerge filter=vrc eol=lf text
-*.unity merge=unityyamlmerge filter=vrc eol=lf text
+*.asset merge=unityyamlmerge filter=vrc eol=lf text=auto
+*.mat merge=unityyamlmerge eol=lf text=auto
+*.meta merge=unityyamlmerge eol=lf text=auto
+*.prefab merge=unityyamlmerge filter=vrc eol=lf text=auto
+*.unity merge=unityyamlmerge filter=vrc eol=lf text=auto
 
 .coderabbit.yaml export-ignore
 .gitattributes export-ignore

diff --git a/.gitconfig b/.gitconfig
@@ -1,2 +1,6 @@
 [core]
   hideDotFiles = dotGitOnly
+[filter "vrc"]
+	clean = git vrc clean --file %f
+	smudge = git vrc smudge --file %f
+	required = true