SamWorkset #1

Merged
rannosam merged 24 commits from SamWorkset into master 2025-05-22 15:43:51 +00:00
Showing only changes of commit fe90ea9996 - Show all commits

3
.gitattributes vendored
View File

@ -1,7 +1,7 @@
* text=auto * text=auto
# Unity files # Unity files
*.meta -text merge=unityyamlmerge diff *.meta -text merge=unityyamlmerge diff
*.unity -text merge=unityyamlmerge diff *.unity filter=lfs diff=lfs merge=lfs -text
*.asset filter=lfs diff=lfs merge=lfs -text *.asset filter=lfs diff=lfs merge=lfs -text
*.prefab -text merge=unityyamlmerge diff *.prefab -text merge=unityyamlmerge diff
*.mat -text merge=unityyamlmerge diff *.mat -text merge=unityyamlmerge diff
@ -99,4 +99,3 @@ Library/PlayerDataCache/Win64/Data/level0 filter=lfs diff=lfs merge=lfs -text
Library/PlayerDataCache/Win64/Data/sharedassets0.assets filter=lfs diff=lfs merge=lfs -text Library/PlayerDataCache/Win64/Data/sharedassets0.assets filter=lfs diff=lfs merge=lfs -text
Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS filter=lfs diff=lfs merge=lfs -text Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS filter=lfs diff=lfs merge=lfs -text
Assets/_PROJECT/Scenes/DeltaBuilding_base.unity filter=lfs diff=lfs merge=lfs -text Assets/_PROJECT/Scenes/DeltaBuilding_base.unity filter=lfs diff=lfs merge=lfs -text
*.unity filter=lfs diff=lfs merge=lfs -text