Merge from FRJ master

Field-Robotics-Japan · Jul 11, 2023 · e6a00e4 · e6a00e4
2 parents 78142b0 + 30bec3d
commit e6a00e4
Show file tree

Hide file tree

Showing 440 changed files with 7,608,747 additions and 3,993 deletions.
diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 name: Acquire activation file from 2020 to 2022 LTS
 
 on:
@@ -52,3 +53,27 @@ jobs:
         with:
           name: ${{ steps.getManualLicenseFile.outputs.filePath }}
           path: ${{ steps.getManualLicenseFile.outputs.filePath }}
+=======
+name: Acquire activation file
+on: 
+  pull_request:
+    branches:
+    - master
+jobs:
+  activation:
+    name: Request manual activation file 🔑
+    runs-on: ubuntu-latest
+    steps:
+    # Request manual activation file
+    - name: Request manual activation file
+      id: getManualLicenseFile
+      uses: webbertakken/[email protected]
+      with:
+        unityVersion: 2020.1.13f1
+    # Upload artifact (Unity_v20XX.X.XXXX.alf)
+    - name: Expose as artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: ${{ steps.getManualLicenseFile.outputs.filePath }}
+        path: ${{ steps.getManualLicenseFile.outputs.filePath }}
+>>>>>>> 30bec3d2464b1d30841ea94544bdcdaa1f901971
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
         projectPath:
           - ./
         unityVersion:
-          - 2019.3.12f1
+          - 2020.1.13f1
         testMode:
           - all
 #           - playmode

diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,4 @@ crashlytics-build.properties
 /[Aa]ssets/[Ss]treamingAssets/aa/*
 
 # End of https://www.toptal.com/developers/gitignore/api/unity
+.vsconfig
diff --git a/.gitmodules b/.gitmodules
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
diff --git a/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
diff --git a/.../AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta b/.../AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta
diff --git a/...dressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/...dressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
diff --git a/...ableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/...ableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,3 +75,4 @@ crashlytics-build.properties
		/[Aa]ssets/[Ss]treamingAssets/aa/*

		# End of https://www.toptal.com/developers/gitignore/api/unity
		.vsconfig