Merge branch 'main' into analogrelay/reg-1577

Regression-Games · Jan 24, 2024 · 28a1fd6 · 28a1fd6
2 parents b919663 + b2fef14
commit 28a1fd6
Show file tree

Hide file tree

Showing 81 changed files with 1,418 additions and 311 deletions.
diff --git a/samples/RegressionGames.Unity.Samples.BossRoom/Assets/Scenes/MainMenu.unity b/samples/RegressionGames.Unity.Samples.BossRoom/Assets/Scenes/MainMenu.unity
diff --git a/src/UnityHostGame/.gitignore b/src/UnityHostGame/.gitignore
@@ -14,6 +14,9 @@
 # They also could contain extremely sensitive data
 /[Mm]emoryCaptures/
 
+# Asset meta data should only be ignored when the corresponding asset is also ignored
+!/[Aa]ssets/**/*.meta
+
 # Recordings can get excessive in size
 /[Rr]ecordings/
 

diff --git a/src/gg.regression.unity.testing/.gitignore b/src/gg.regression.unity.testing/.gitignore
@@ -14,6 +14,9 @@
 # They also could contain extremely sensitive data
 /[Mm]emoryCaptures/
 
+# Asset meta data should only be ignored when the corresponding asset is also ignored
+!/[Aa]ssets/**/*.meta
+
 # Recordings can get excessive in size
 /[Rr]ecordings/