From 52dd4af25a7e5faf50bf5891fefce6bbf0ed4b2b Mon Sep 17 00:00:00 2001 From: Nathan Koch Date: Sun, 3 May 2020 16:03:10 -0400 Subject: [PATCH] lfs updates and ignore updates --- .gitattributes | 15 +++++++++------ .gitignore | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index 54baec9..6cdcfc1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,13 +4,18 @@ *.meta linguist-generated *.prefab linguist-generated *.unity linguist-generated + ## git-lfs ## +# Unity HDRP lighting data +LightingData.asset filter=lfs diff=lfs merge=lfs -text # 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 *.tif filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text # Design *.psd filter=lfs diff=lfs merge=lfs -text *.ai filter=lfs diff=lfs merge=lfs -text @@ -29,13 +34,15 @@ *.FBX filter=lfs diff=lfs merge=lfs -text *.fbx filter=lfs diff=lfs merge=lfs -text *.obj filter=lfs diff=lfs merge=lfs -text +*.hip filter=lfs diff=lfs merge=lfs -text +*.hiplc filter=lfs diff=lfs merge=lfs -text # Substances *.sbs filter=lfs diff=lfs merge=lfs -text *.sbsar filter=lfs diff=lfs merge=lfs -text +*.sbsprs filter=lfs diff=lfs merge=lfs -text +*.spp 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 @@ -45,7 +52,3 @@ *.rns filter=lfs diff=lfs merge=lfs -text *.reason filter=lfs diff=lfs merge=lfs -text *.lxo filter=lfs diff=lfs merge=lfs -text - -# Project Specific -Assets/Mega-Fiers/*.unity filter=lfs diff=lfs merge=lfs -text -Contents/MacOS/* filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7b15073..1a4763c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,11 +25,13 @@ Network Trash Folder Temporary Items .apdisk +.autosave/ [Ll]ibrary/ [Tt]emp/ [Oo]bj/ [Bb]uild/ [Bb]uilds/ +[Bb]ackup/ Assets/AssetStoreTools* # Visual Studio cache directory @@ -68,6 +70,7 @@ Recordings/ # Cinema 4D cache files *.gil substance_cache/ +*.painter_lock # Adobe audition cache files -*.pkf \ No newline at end of file +*.pkf