From 4eb82ffd9b4116d257c92b8f893d7975b18a7789 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 5 Feb 2023 23:17:08 +0900 Subject: [PATCH 1/2] Add auto-generated scenes by Unity play mode tests --- Unity.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Unity.gitignore b/Unity.gitignore index 58cbc825..a11ddf93 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -70,3 +70,6 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* + +# Auto-generated scenes by play mode tests +/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity* From 8789ddbda3ec1a52fa51a8a90de82d17365a544d Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 15 Jun 2025 22:37:42 +0900 Subject: [PATCH 2/2] Fix conflicts --- Unity.gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Unity.gitignore b/Unity.gitignore index a11ddf93..94903c67 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -2,6 +2,7 @@ # # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore # +.utmp/ /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -9,6 +10,11 @@ /[Bb]uilds/ /[Ll]ogs/ /[Uu]ser[Ss]ettings/ +*.log + +# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control. +*.blend1 +*.blend1.meta # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data @@ -55,10 +61,14 @@ ExportedObj/ # Unity3D generated file on crash reports sysinfo.txt +# Mono auto generated files +mono_crash.* + # Builds *.apk *.aab *.unitypackage +*.unitypackage.meta *.app # Crashlytics generated file @@ -71,5 +81,11 @@ crashlytics-build.properties /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* +# Visual Scripting auto-generated files +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta + # Auto-generated scenes by play mode tests /[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*