From ad8842ceffc7cc82ccc485023307a8e0d73a6012 Mon Sep 17 00:00:00 2001 From: "BEELZEBUB\\DIS" Date: Tue, 9 May 2023 13:57:04 +0200 Subject: [PATCH 1/4] Awake() apparently isn't called on superclasses for classes that inherit MonoBehaviour. Made it virtual so subclasses can override it and call the base class Awake. Backport candidate. (cherry picked from commit 10636de6ee0642323dff5287189fe3da01eb1cb2) --- Assets/Pilots/Common/Controllers/PilotController.cs | 2 +- Assets/Pilots/Common/Interaction/InputAdditions.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Pilots/Common/Controllers/PilotController.cs b/Assets/Pilots/Common/Controllers/PilotController.cs index b84b5b9fb..bf9e042e4 100644 --- a/Assets/Pilots/Common/Controllers/PilotController.cs +++ b/Assets/Pilots/Common/Controllers/PilotController.cs @@ -42,7 +42,7 @@ public string Name() return $"{GetType().Name}"; } - public void Awake() + public virtual void Awake() { if (Instance != null) { diff --git a/Assets/Pilots/Common/Interaction/InputAdditions.cs b/Assets/Pilots/Common/Interaction/InputAdditions.cs index 456df57da..abe559160 100644 --- a/Assets/Pilots/Common/Interaction/InputAdditions.cs +++ b/Assets/Pilots/Common/Interaction/InputAdditions.cs @@ -24,6 +24,7 @@ static NegateProcessor() [RuntimeInitializeOnLoadMethod] static void Initialize() { + Debug.Log("NegateProcessor: registering with Input System"); InputSystem.RegisterProcessor(); } From f261e369d4b293f9c382aae6b0849cf56e3efaeb Mon Sep 17 00:00:00 2001 From: "Fiddlehead\\vrtogether" Date: Tue, 16 May 2023 11:49:21 +0200 Subject: [PATCH 2/4] Attempting to fix #99 by doing git lfs pull in each submodule, and caching the results. --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a1ebe77b..ca8afc154 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: # Git LFS - name: Create LFS file list - run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id + run: (git lfs ls-files -l ; git submodules foreach git lfs ls-files -l) | cut -d' ' -f1 | sort > .lfs-assets-id - name: Restore LFS cache uses: actions/cache@v3 @@ -44,6 +44,7 @@ jobs: - name: Git LFS Pull run: | git lfs pull + git submodule foreach git lfs pull git add . git reset --hard From edfa77a3c35ab4911d1d88039bf52db5308d9d53 Mon Sep 17 00:00:00 2001 From: "Fiddlehead\\vrtogether" Date: Tue, 16 May 2023 12:02:03 +0200 Subject: [PATCH 3/4] Cannot use semicolon in run command. Change to multiline. --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca8afc154..4a2b0a01e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,11 @@ jobs: # Git LFS - name: Create LFS file list - run: (git lfs ls-files -l ; git submodules foreach git lfs ls-files -l) | cut -d' ' -f1 | sort > .lfs-assets-id + run: | + git lfs ls-files -l > .lfs-assets-id-unsorted + git submodules foreach git lfs ls-files -l >> .lfs-assets-id-unsorted + cat .lfs-assets-id-unsorted | cut -d' ' -f1 | sort > .lfs-assets-id + cat .lfs-assets-id-unsorted - name: Restore LFS cache uses: actions/cache@v3 From c5f5c542e33a911e8d90be0e8dbed9408bceb802 Mon Sep 17 00:00:00 2001 From: "Fiddlehead\\vrtogether" Date: Tue, 16 May 2023 12:05:18 +0200 Subject: [PATCH 4/4] git submodule, not submodules. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a2b0a01e..5d6084cc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: - name: Create LFS file list run: | git lfs ls-files -l > .lfs-assets-id-unsorted - git submodules foreach git lfs ls-files -l >> .lfs-assets-id-unsorted + git submodule foreach git lfs ls-files -l >> .lfs-assets-id-unsorted cat .lfs-assets-id-unsorted | cut -d' ' -f1 | sort > .lfs-assets-id cat .lfs-assets-id-unsorted