diff --git a/.gitattributes b/.gitattributes index 6b976a7..5b63be0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,8 @@ *.asmdef text eol=lf *.asset text eol=lf *.controller text eol=lf +*.cubemap text eol=lf +*.flare text eol=lf *.json text eol=lf *.mat text eol=lf *.meta text eol=lf @@ -24,20 +26,30 @@ *.shader text eol=crlf *.sln text eol=crlf +# Documents +*.pdf filter=lfs diff=lfs merge=lfs -text + # Blender *.blend filter=lfs diff=lfs merge=lfs -text +# 3ds Max +*.3ds filter=lfs diff=lfs merge=lfs -text +*.max filter=lfs diff=lfs merge=lfs -text + # Maya *.ma text eol=lf *.mb filter=lfs diff=lfs merge=lfs -text -# Substance Painter/Designer -.sbs text eol=lf -.sbsar filter=lfs diff=lfs merge=lfs -text -.spp filter=lfs diff=lfs merge=lfs -text -.spsm filter=lfs diff=lfs merge=lfs -text +# Modo +*.lxo filter=lfs diff=lfs merge=lfs -text -# Filmbox +# Substance Painter/Designer +*.sbs text eol=lf +*.sbsar filter=lfs diff=lfs merge=lfs -text +*.spp filter=lfs diff=lfs merge=lfs -text +*.spsm filter=lfs diff=lfs merge=lfs -text + +# Filmbox (FBX) # *your mileage may vary, since .fbx can be either in binary or ascii *.fbx text eol=lf # *.fbx filter=lfs diff=lfs merge=lfs -text @@ -47,11 +59,19 @@ *.glb filter=lfs diff=lfs merge=lfs -text *.bin filter=lfs diff=lfs merge=lfs -text +# OBJ +*.obj text eol=lf + # Images *.bmp filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.hdr filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text *.pdn filter=lfs diff=lfs merge=lfs -text +*.pfm filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text *.tga filter=lfs diff=lfs merge=lfs -text @@ -67,7 +87,18 @@ *.webm filter=lfs diff=lfs merge=lfs -text # Sound +*.mid filter=lfs diff=lfs merge=lfs -text +*.midi filter=lfs diff=lfs merge=lfs -text *.mp3 filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text *.opus filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text + +# Binaries +*.dll filter=lfs diff=lfs merge=lfs -text +*.exe filter=lfs diff=lfs merge=lfs -text + +# Shell scripts +*.bat text eol=crlf +*.cmd text eol=crlf +*.sh text eol=lf diff --git a/.gitignore b/.gitignore index 0755730..6f4f5a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # This .gitignore file should be placed at the root of your Unity project directory -# # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore -# + /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -50,6 +49,10 @@ ExportedObj/ *.opendb *.VC.db +# C# compiler trash, comment this out if you need to use Response Files +*.rsp +*.rsp.meta + # Unity3D generated meta files *.pidb.meta *.pdb.meta @@ -67,7 +70,7 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties -# JetBrains stuff +# JetBrains trash .idea/* # Packed Addressables @@ -77,7 +80,7 @@ crashlytics-build.properties /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* -# VRC stuff +# VRC trash /[Aa]ssets/[Uu]don/ /[Aa]ssets/[Uu]don.meta /[Aa]ssets/VRCSDK/ @@ -88,7 +91,7 @@ crashlytics-build.properties /[Aa]ssets/UdonSharp/Scripts/Editor.meta /[Aa]ssets/SerializedUdonPrograms* -# UdonSharp stuff +# UdonSharp trash /[Aa]ssets/UdonSharp /[Aa]ssets/UdonSharp.meta /[Aa]ssets/Merlin.meta @@ -96,14 +99,21 @@ crashlytics-build.properties /[Aa]ssets/Merlin/Editor/EasyEventEditor.cs /[Aa]ssets/Merlin/Editor/EasyEventEditor.cs.meta -# OpenXR stuff +# OpenXR trash /[Aa]ssets/XR /[Aa]ssets/XR.meta +/[Pp]roject[Ss]ettings/EditorBuildSettings.asset -# Trash stuff -*_cache.txt +# Packages trash (adjust as needed) +/[Pp]ackages/*/**/* +/[Pp]ackages/.* +!/[Pp]ackages/com.vrchat.core.bootstrap/**/* -# Blender stuff +# Poiyomi trash +/Poi +/Thry + +# Blender trash *.blend[0-9]* *.pyc __pycache__ diff --git a/repo-cleanup.cmd b/repo-cleanup.cmd new file mode 100644 index 0000000..7f7cfb2 --- /dev/null +++ b/repo-cleanup.cmd @@ -0,0 +1,26 @@ +@ECHO OFF +TITLE Clean up Unity Project repo +SETLOCAL EnableDelayedExpansion + +CALL :cleanup --dry-run || GOTO die + +CHOICE /M "Execute" +IF !ERRORLEVEL! NEQ 1 ( + ECHO Aborting cleanup... +) ELSE ( + CALL :cleanup || GOTO die + ECHO Done. +) + +:end +PAUSE +EXIT /B 0 + +:die +PAUSE +EXIT /B %ERRORLEVEL% + + +:cleanup + git clean -dfX %* "%~dp0." || EXIT /B + EXIT /B 0 diff --git a/repo-cleanup.sh b/repo-cleanup.sh new file mode 100755 index 0000000..4714ad9 --- /dev/null +++ b/repo-cleanup.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +me="$(realpath "$0")" +repository="$(dirname "$me")/." + +# I have no mouth but i must scream +if [ ! -t 0 ]; then + if command -v x-terminal-emulator >/dev/null 2>&1; then + x-terminal-emulator -e "$me" + elif command -v xdg-terminal >/dev/null 2>&1; then + xdg-terminal "$me" + else + echo "Run me from the fucking terminal!" >"${me}.README" + exit 1 + fi + exit 0 +fi + +git clean -dfX --dry-run "${repository}" + +printf "Execute [Y,N]?"; read -r yn +if [ "$yn" = "${yn#[Yy]}" ] ;then + echo "Aborting cleanup..." +else + git clean -dfX "${repository}" + echo "Done." +fi + +printf "Press any key to continue..."; read -r _ +exit 0