diff --git a/.gitignore b/.gitignore index 5c5f9f8..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,15 +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/Packages/.gitignore b/Packages/.gitignore deleted file mode 100644 index 7cf1ed8..0000000 --- a/Packages/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*/ -#!com.vrchat.core.*/ -!com.vrchat.core.bootstrap/ diff --git a/README.md b/README.md index f001491..5d421d6 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ The template have: - Compatible with CreatorCompanion (but it may fuck up line endings!) > If VPM Resolver is not present, Bootstapper will install latest version of it which might not be compatible with older Unity versions. -> Add `com.vrchat.core.vpm-resolver` to git, if you want to lock it -> (you might need to adjust `Packages/.gitignore` file for this). +> Add `com.vrchat.core.vpm-resolver` to git, if you want to lock it (you need to adjust `.gitignore` file for this). The repository have separate branches for separate content types, the only difference between them is default packages in `Packages/vpm-manifest.json` > Branches structure @@ -34,7 +33,7 @@ The repository have separate branches for separate content types, the only diffe > **IMPORTANT**: When opening a previously worked on project on a new machine, Unity may warn you about script errors and suggest you enter Safe Mode, > this is because VPM has not loaded yet and didn't resolved the required packages, ignore the errors and continue loading. -> Sometimes you may need to reopen the project for all scripts to recompile. +> Sometimes you may need to reopen the project couple times for all packages to resolve and scripts to recompile. ## License For project's license see [LICENSE](./LICENSE) file.