From 5d8d54b5166f6af7a3cd5cd5a4467ab5c26046d4 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Tue, 25 Apr 2023 14:02:43 -0400 Subject: [PATCH 1/5] removing project-specific gitignores --- Basic/2DSpaceShooter/.gitignore | 91 --------------------------------- Basic/ClientDriven/.gitignore | 91 --------------------------------- Basic/Invaders/.gitignore | 91 --------------------------------- 3 files changed, 273 deletions(-) delete mode 100644 Basic/2DSpaceShooter/.gitignore delete mode 100644 Basic/ClientDriven/.gitignore delete mode 100644 Basic/Invaders/.gitignore diff --git a/Basic/2DSpaceShooter/.gitignore b/Basic/2DSpaceShooter/.gitignore deleted file mode 100644 index 474193d65..000000000 --- a/Basic/2DSpaceShooter/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# This .gitignore file should be placed at the root of your Unity project directory -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore - -# A marker file of which existence is used to decide whether to run the first-launch experience or not. -InitCodeMarker -/[Tt]utorial [Dd]efaults/ - -# Packed templates go here -upm-ci~/ -upm-ci.log - -# Never ignore Asset meta data... -!/[Aa]ssets/**/*.meta - -# User's project-specific settings implemented using Settings Manager -/ProjectSettings/Packages - -# The rest are general best practices for Unity projects -/.Editor/ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Mm]emoryCaptures/ -/[Vv]alidationSuiteResults/ - -# Project/user-specific settings using Settings Manager -/ProjectSettings/Packages/ -# UserSettings introduced in 2020.1 -/UserSettings/ - -# Uncomment this line if you wish to ignore the asset store tools plugin -/[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -[Aa]ssets/Plugins/Editor/JetBrains* - -# Rider -.idea/ - -# Visual Studio cache directory -.vs/ - -# Visual Studio Code settings directory -.vscode/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties -*.orig -*.orig.meta - -# Ignore build reports -/Assets/BuildReports* - -# Mac file setting -.DS_Store diff --git a/Basic/ClientDriven/.gitignore b/Basic/ClientDriven/.gitignore deleted file mode 100644 index 474193d65..000000000 --- a/Basic/ClientDriven/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# This .gitignore file should be placed at the root of your Unity project directory -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore - -# A marker file of which existence is used to decide whether to run the first-launch experience or not. -InitCodeMarker -/[Tt]utorial [Dd]efaults/ - -# Packed templates go here -upm-ci~/ -upm-ci.log - -# Never ignore Asset meta data... -!/[Aa]ssets/**/*.meta - -# User's project-specific settings implemented using Settings Manager -/ProjectSettings/Packages - -# The rest are general best practices for Unity projects -/.Editor/ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Mm]emoryCaptures/ -/[Vv]alidationSuiteResults/ - -# Project/user-specific settings using Settings Manager -/ProjectSettings/Packages/ -# UserSettings introduced in 2020.1 -/UserSettings/ - -# Uncomment this line if you wish to ignore the asset store tools plugin -/[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -[Aa]ssets/Plugins/Editor/JetBrains* - -# Rider -.idea/ - -# Visual Studio cache directory -.vs/ - -# Visual Studio Code settings directory -.vscode/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties -*.orig -*.orig.meta - -# Ignore build reports -/Assets/BuildReports* - -# Mac file setting -.DS_Store diff --git a/Basic/Invaders/.gitignore b/Basic/Invaders/.gitignore deleted file mode 100644 index 474193d65..000000000 --- a/Basic/Invaders/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# This .gitignore file should be placed at the root of your Unity project directory -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore - -# A marker file of which existence is used to decide whether to run the first-launch experience or not. -InitCodeMarker -/[Tt]utorial [Dd]efaults/ - -# Packed templates go here -upm-ci~/ -upm-ci.log - -# Never ignore Asset meta data... -!/[Aa]ssets/**/*.meta - -# User's project-specific settings implemented using Settings Manager -/ProjectSettings/Packages - -# The rest are general best practices for Unity projects -/.Editor/ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Mm]emoryCaptures/ -/[Vv]alidationSuiteResults/ - -# Project/user-specific settings using Settings Manager -/ProjectSettings/Packages/ -# UserSettings introduced in 2020.1 -/UserSettings/ - -# Uncomment this line if you wish to ignore the asset store tools plugin -/[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -[Aa]ssets/Plugins/Editor/JetBrains* - -# Rider -.idea/ - -# Visual Studio cache directory -.vs/ - -# Visual Studio Code settings directory -.vscode/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties -*.orig -*.orig.meta - -# Ignore build reports -/Assets/BuildReports* - -# Mac file setting -.DS_Store From 767b90bae960142ddd48449ffea6028bb98aca22 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Tue, 25 Apr 2023 14:02:59 -0400 Subject: [PATCH 2/5] Including parrelsync clones in gitignore --- .gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 36e3f851c..bc2ddc45b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ upm-ci.log !/[Aa]ssets/**/*.meta # User's project-specific settings implemented using Settings Manager -/ProjectSettings/Packages +**/ProjectSettings/Packages # The rest are general best practices for Unity projects **/.Editor/ @@ -27,7 +27,7 @@ upm-ci.log **/[Vv]alidationSuiteResults/ # Project/user-specific settings using Settings Manager -/ProjectSettings/Packages/ +**/ProjectSettings/Packages/ # UserSettings introduced in 2020.1 **/UserSettings/ @@ -89,3 +89,5 @@ crashlytics-build.properties # Mac file setting .DS_Store + +**/*_clone* From 1cb9645af8e5ea082c4e9cc6222aa7559081103f Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Tue, 25 Apr 2023 14:05:32 -0400 Subject: [PATCH 3/5] syntax --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bc2ddc45b..664795399 100644 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,4 @@ crashlytics-build.properties # Mac file setting .DS_Store -**/*_clone* +**/*_clone*/ From 1c297c97421a3b09cc40a7ed3277dd78b4bd4100 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Tue, 25 Apr 2023 14:06:15 -0400 Subject: [PATCH 4/5] syntax --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 664795399..dfa880a79 100644 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,4 @@ crashlytics-build.properties # Mac file setting .DS_Store -**/*_clone*/ +**/*_clone_*/ From 0c3354010786bc132b224aec093f82113b9c31e6 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Tue, 25 Apr 2023 14:08:35 -0400 Subject: [PATCH 5/5] changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af41fef7e..a430054e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,11 @@ - IP address input field text value is now passed into UTP's ConnectionData, allowing for remote IP address hosting (#112) - Enemy and Player bullet explosion FX are now replicated on clients via ClientRpcs (#113) +### Bitesize Samples Repository + +#### Fixed +- Removed individual gitignore files for individual projects and added parrelsync clones to root gitignore file (#117) + ## [1.2.1] - 2023-02-17 ### Dynamic Addressables Network Prefabs