From b53ff03dfe244759d3c1676b4d6ab1afd1d92843 Mon Sep 17 00:00:00 2001 From: Marc Hernandez Date: Sat, 11 May 2024 16:04:06 -0700 Subject: [PATCH] General git stuff --- .gitattributes | 10 +++++- .gitignore | 86 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/.gitattributes b/.gitattributes index d612aee..5b3a6a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,10 +16,18 @@ # Set the default behavior for all files. * text=auto eol=lf +# Godot +# Godot +# Godot +*.bin filter=lfs diff=lfs merge=lfs -text lockable +*.res filter=lfs diff=lfs merge=lfs -text lockable +*.glb filter=lfs diff=lfs merge=lfs -text lockable +*.lmbake filter=lfs diff=lfs merge=lfs -text lockable + + # Source code # Source code # Source code -*.cs text eol=lf *.rs text *.bash text eol=lf *.bat text eol=crlf diff --git a/.gitignore b/.gitignore index c0e6415..3af6314 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,67 @@ -#Folders -Library/ -Temp/ -Builds/ -Libraries/ -Debug/ -Release/ -run/ -bin/ -obj/ + + +# Group Ignores +ignored/ +ignore/ + + +# Personal ignores +# ignore the addons folder +addons/ +exports/ +log/ +save/ +samples/ + +# Godot 4+ specific ignores +.godot/ + +*.swp +*.*~ +project.lock.json +.DS_Store +*.pyc +nupkg/ .vs/ -#Project/User Preference Files -*.pidb -*.userprefs -*.user +# Visual Studio Code +# Created by https://www.gitignore.io/api/visualstudiocode +# Edit at https://www.gitignore.io/?templates=visualstudiocode + +### VisualStudioCode ### +.vscode/* # Maybe .vscode/**/* instead - see comments +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +### VisualStudioCode Patch ### +# Ignore all local history of files +**/.history + +# End of https://www.gitignore.io/api/visualstudiocode + + + + +# User-specific files *.suo +*.user +*.userosscache +*.sln.docstates -#OS Junk -Thumbs.db -.DS_Store* -ehthumbs.db -Icon7 - - - -#*.sln +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +msbuild.log +msbuild.err +msbuild.wrn