Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626

Game/.gitignore

@@ -1,49 +1,17 @@
-# This .gitignore file should be placed at the root of your Unity project directory
+# This .gitignore should be placed at the root of your Unity project directory.
-#
+
-# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
+# --- Unity Generated Folders ---
-#
-# Recommended: add any editor/OS/tool-specific ignore rules from the Global/ templates as needed.
-# See: https://github.com/github/gitignore/tree/main/Global
-#
-.idea/
-.utmp/
 /[Ll]ibrary/
 /[Tt]emp/
 /[Oo]bj/
 /[Bb]uild/
 /[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
 /[Mm]emoryCaptures/
-
-# Recordings can get excessive in size
 /[Rr]ecordings/
+/[Uu]ser[Ss]ettings/
 
-# Uncomment this line if you wish to ignore the asset store tools plugin
+# --- Autogenerated Files ---
-# /[Aa]ssets/AssetStoreTools*
-
-# Autogenerated Jetbrains Rider plugin
-/[Aa]ssets/Plugins/Editor/JetBrains*
-# Jetbrains Rider personal-layer settings
-*.DotSettings.user
-
-# Visual Studio cache directory
-.vs/
-
-# Gradle cache directory
-.gradle/
-
-# Autogenerated VS/MD/Consulo solution and project files
-ExportedObj/
-.consulo/
 *.csproj
 *.unityproj
 *.sln
@@ -59,50 +27,55 @@ ExportedObj/
 *.mdb
 *.opendb
 *.VC.db
-
-# Unity3D generated meta files
 *.pidb.meta
 *.pdb.meta
 *.mdb.meta
-
+*.log
-# Unity3D generated file on crash reports
 sysinfo.txt
-
-# Mono auto generated files
 mono_crash.*
+crashlytics-build.properties
 
-# Builds
+# --- IDE / OS Specific ---
+.idea/
+.vs/
+.gradle/
+.vscode/
+*.DotSettings.user
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# --- Assets Folder Caches ---
+/[Aa]ssets/AssetStoreTools*
+/[Aa]ssets/Plugins/Editor/JetBrains*
+/[Aa]ssets/[Ss]ceneDependencyCache*
+/[Aa]ssets/[Cc]ache/
+/[Aa]ssets/[Aa]ddressables_Temp/
+/[Aa]ssets/Unity.VisualScripting.Generated/
+
+# --- Addressables ---
+/[Aa]ssets/AddressableAssetsData/*/*.bin*
+/[Aa]ssets/AddressableAssetsData/*/*.json*
+/ServerData/
+/[Aa]ssets/StreamingAssets/aa/
+
+# --- Build Targets ---
 *.apk
 *.aab
 *.unitypackage
 *.unitypackage.meta
 *.app
+*.exe
+*.dll
 
-# Crashlytics generated file
+# --- Blender/Other ---
-crashlytics-build.properties
+*.blend1
+*.blend1.meta
 
-# TestRunner generated files
+# --- Test Runner ---
 InitTestScene*.unity*
-
-# Addressables default ignores, before user customizations
-/ServerData
-/[Aa]ssets/StreamingAssets/aa*
-/[Aa]ssets/AddressableAssetsData/link.xml*
-/[Aa]ssets/Addressables_Temp*
-# By default, Addressables content builds will generate addressables_content_state.bin
-# files in platform-specific subfolders, for example:
-# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin
-/[Aa]ssets/AddressableAssetsData/*/*.bin*
-
-# 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*
-
-# Auto-generated cache in Assets folder
-/[Aa]ssets/[Ss]ceneDependencyCache*
-.idea/