Skip to content

Commit

Permalink
lfs updates and ignore updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mimetaur committed May 3, 2020
1 parent 18f969d commit 52dd4af
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
15 changes: 9 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -68,6 +70,7 @@ Recordings/
# Cinema 4D cache files
*.gil
substance_cache/
*.painter_lock

# Adobe audition cache files
*.pkf
*.pkf

0 comments on commit 52dd4af

Please sign in to comment.