Merge branch 'development/mediascape' into deployment/mediascape

# Conflicts:
#	Assets/Pilots/Common/Prefabs/01_Player/PFB_PlayerMediascape.prefab
#	config.json

.gitattributes

@@ -3,6 +3,7 @@
 *.tga filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
 *.fbx filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
 *.hdr filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
 *.FBX filter=lfs diff=lfs merge=lfs -text

.github/workflows/activation.yml

@@ -0,0 +1,21 @@
+name: Acquire activation file
+
+on:
+  workflow_dispatch: {}
+
+jobs:
+  activation:
+    name: Request manual activation file 🔑
+    runs-on: ubuntu-latest
+    steps:
+      # Request manual activation file
+      - name: Request manual activation file
+        id: getManualLicenseFile
+        uses: game-ci/unity-request-activation-file@v2
+      # Upload artifact (Unity_v20XX.X.XXXX.alf)
+      - name: Expose as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
+          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
+

.github/workflows/main.yml

@@ -0,0 +1,222 @@
+name: Build and Test
+
+on:
+  push:
+    branches:
+      - 'deployment/**'
+    tags:
+      - 'build*'
+  pull_request:
+    branches:
+      - 'deployment/**'
+
+
+jobs:
+  buildForWindows:
+    name: Build for Windows
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        unityVersion:
+          - 2021.3.24f1
+        targetPlatform:
+          - StandaloneWindows64
+    steps:
+      # Checkout (without LFS)
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+
+      # Git LFS
+      - name: Create LFS file list
+        run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
+
+      - name: Restore LFS cache
+        uses: actions/cache@v3
+        id: lfs-cache
+        with:
+          path: .git/lfs
+          key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
+
+      - name: Git LFS Pull
+        run: |
+          git lfs pull
+          git add .
+          git reset --hard
+
+      # Cache
+      - uses: actions/cache@v3
+        with:
+          path: Library
+          key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+          restore-keys: |
+            Library-
+
+#      # Test
+#      - name: Run tests
+#        uses: game-ci/unity-test-runner@v2
+#        env:
+#          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+#        with:
+#          githubToken: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build
+      - name: Build project
+        uses: game-ci/unity-builder@v2
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+        with:
+          unityVersion: ${{ matrix.unityVersion }}
+          targetPlatform: ${{ matrix.targetPlatform }}
+          buildName: VR2Gather
+
+      # Output
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Build-${{ matrix.targetPlatform }}
+          path: build
+          retention-days: 4
+
+#   buildForLinux:
+#     name: Build for Linux
+#     runs-on: ubuntu-latest
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         unityVersion:
+#           - 2021.3.11f1
+#         targetPlatform:
+#           - StandaloneLinux64
+# #          - Android
+#     steps:
+#       # Checkout (without LFS)
+#       - name: Checkout repository
+#         uses: actions/checkout@v3
+#         with:
+#           submodules: true
+#           token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+# 
+#       # Git LFS
+#       - name: Create LFS file list
+#         run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
+# 
+#       - name: Restore LFS cache
+#         uses: actions/cache@v3
+#         id: lfs-cache
+#         with:
+#           path: .git/lfs
+#           key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
+# 
+#       - name: Git LFS Pull
+#         run: |
+#           git lfs pull
+#           git add .
+#           git reset --hard
+# 
+#       # Cache
+#       - uses: actions/cache@v3
+#         with:
+#           path: Library
+#           key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+#           restore-keys: |
+#             Library-
+# 
+# #      # Test
+# #      - name: Run tests
+# #        uses: game-ci/unity-test-runner@v2
+# #        env:
+# #          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+# #        with:
+# #          githubToken: ${{ secrets.GITHUB_TOKEN }}
+# 
+#       # Build
+#       - name: Build project
+#         uses: game-ci/unity-builder@v2
+#         env:
+#           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+#           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+#           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+#         with:
+#           unityVersion: ${{ matrix.unityVersion }}
+#           targetPlatform: ${{ matrix.targetPlatform }}
+# 
+#       # Output
+#       - uses: actions/upload-artifact@v3
+#         with:
+#           name: Build-${{ matrix.targetPlatform }}
+#           path: build
+#           retention-days: 4
+# 
+#   buildForMacos:
+#     name: Build for MacOS
+#     runs-on: macos-latest
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         unityVersion:
+#           - 2021.3.11f1
+#         targetPlatform:
+#           - StandaloneOSX
+#     steps:
+#       # Checkout (without LFS)
+#       - name: Checkout repository
+#         uses: actions/checkout@v2
+#         with:
+#           submodules: true
+#           token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+# 
+#       # Git LFS
+#       - name: Create LFS file list
+#         run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
+# 
+#       - name: Restore LFS cache
+#         uses: actions/cache@v3
+#         id: lfs-cache
+#         with:
+#           path: .git/lfs
+#           key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
+# 
+#       - name: Git LFS Pull
+#         run: |
+#           git lfs pull
+#           git add .
+#           git reset --hard
+# 
+#       # Cache
+#       - uses: actions/cache@v3
+#         with:
+#           path: Library
+#           key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+#           restore-keys: |
+#             Library-
+# 
+# #      # Test
+# #      - name: Run tests
+# #        uses: game-ci/unity-test-runner@v2
+# #        env:
+# #          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+# #        with:
+# #          githubToken: ${{ secrets.GITHUB_TOKEN }}
+# 
+#       # Build
+#       - name: Build project
+#         uses: game-ci/unity-builder@v2
+#         env:
+#           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+#           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+#           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+#         with:
+#           unityVersion: ${{ matrix.unityVersion }}
+#           targetPlatform: ${{ matrix.targetPlatform }}
+# 
+#       # Output
+#       - uses: actions/upload-artifact@v3
+#         with:
+#           name: Build-${{ matrix.targetPlatform }}
+#           path: build
+#           retention-days: 4

.gitignore

@@ -1,4 +1,6 @@
 Library/
+Logs/
+UserSettings/
 Temp/
 obj/
 dlls/
@@ -8,6 +10,7 @@ Assembly-CSharp.csproj
 cameraconfig.xml
 .collabignore
 *.csproj
+*.sln
 Exe/
 Build/
 Builds/

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "Assets/PilotsExternal/mediaScape"]
 	path = Assets/PilotsExternal/mediaScape
 	url = ../VRTApp-mediaScape.git
+[submodule "Assets/ExternalAssets/VR2G-besthttp"]
+	path = Assets/ExternalAssets/VR2G-besthttp
+	url = ../VR2G-besthttp.git
+[submodule "Assets/ExternalAssets/VR2G-nativeLibraries"]
+	path = Assets/ExternalAssets/VR2G-nativeLibraries
+	url = ../VR2G-nativeLibraries