diff --git a/.gitattributes b/.gitattributes index 6ac8ec7..bf4a41e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,132 +1,27 @@ -#https://gist.githubusercontent.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f/raw/dc3e8cab80fc62d1c60db70c761b1ffa636aa796/.gitattributes -#grafted from https://hextantstudios.com/unity-gitattributes/ -# Macro for Unity YAML-based asset files. -[attr]unityyaml -text merge=unityyamlmerge diff -# Macro for all binary files that should use Git LFS. -[attr]lfs -text filter=lfs diff=lfs merge=lfs -# Default to auto-normalized line endings. +# Set the default behavior, in case people don't have core.autocrlf set. * text=auto -# Code -*.cs text diff=csharp -# Unity Text Assets -*.meta unityyaml -*.unity unityyaml -*.asset unityyaml -*.prefab unityyaml -*.mat unityyaml -#asink: anim files can get large -*.anim unityyaml lfs -*.controller unityyaml -*.overrideController unityyaml -*.physicMaterial unityyaml -*.physicsMaterial2D unityyaml -*.playable unityyaml -*.mask unityyaml -*.brush unityyaml -*.flare unityyaml -*.fontsettings unityyaml -*.guiskin unityyaml -*.giparams unityyaml -*.renderTexture unityyaml -*.spriteatlas unityyaml -*.terrainlayer unityyaml -*.mixer unityyaml -*.shadervariants unityyaml -*.preset unityyaml -*.asmdef -text diff -# Unity Binary Assets -*.cubemap lfs -*.unitypackage lfs -# Note: Unity terrain assets must have "-Terrain" suffix. -*-[Tt]errain.asset -unityyaml lfs -# Note: Unity navmesh assets must have "-NavMesh" suffix. -*-[Nn]av[Mm]esh.asset -unityyaml lfs -## git-lfs ## -#Image -*.jpg filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.ai filter=lfs diff=lfs merge=lfs -text -#Audio -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -#Video -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.mov filter=lfs diff=lfs merge=lfs -text + +## Unity ## + +*.txt text +*.cs diff=csharp text +*.cginc text +*.shader text + +*.mat merge=unityyamlmerge eol=lf +*.anim merge=unityyamlmerge eol=lf +*.unity merge=unityyamlmerge eol=lf +*.prefab merge=unityyamlmerge eol=lf +*.physicsMaterial2D merge=unityyamlmerge eol=lf +*.physicsMaterial merge=unityyamlmerge eol=lf +*.physicMaterial merge=unityyamlmerge eol=lf +*.asset merge=unityyamlmerge eol=lf +*.meta merge=unityyamlmerge eol=lf +*.controller merge=unityyamlmerge eol=lf +*.flare merge=unityyamlmerge eol=lf + #3D Object -*.FBX filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.obj filter=lfs diff=lfs merge=lfs -text -#ETC -*.a filter=lfs diff=lfs merge=lfs -text -*.exr filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.pdf filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.dll filter=lfs diff=lfs merge=lfs -text -*.unitypackage filter=lfs diff=lfs merge=lfs -text -*.aif filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -*.rns filter=lfs diff=lfs merge=lfs -text -*.reason filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text -*.tgz filter=lfs diff=lfs merge=lfs -text - -*.aar filter=lfs diff=lfs merge=lfs -text -*.lighting filter=lfs diff=lfs merge=lfs -text - -#/LocalPackages (tests_withnewpackage) -#$ find . -type f | sed -e 's/.*\.//' | sed -e 's/.*\///' | sort -u - -#$ find ./* -type f | sed -e 's/.*\.//' | sed -e 's/.*\///' | sort -u -#LICENSE -#LICENSE_WaveSDKNativeBinary -#aar -#anim -#apk -#asmdef -#asset -#bat -#controller -#cs -#default -#dll -#docx -#dummy -#exe -#exr -#fbx -#gitignored -#ini -#inputactions -#json -#lighting -#mat -#md -#meta -#mtl -#obj -#physicMaterial -#png -#prefab -#preset -#renderTexture -#setting -#shader -#so -#tm1 -#tmp -#txt -#unity -#unitypackage -#wav -#xml - - -*.hdr filter=lfs diff=lfs merge=lfs -text -*.lighting filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text \ No newline at end of file +*.FBX -text +*.fbx -text +*.blend -text +*.obj -text \ No newline at end of file