diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a1ebe77b..5d6084cc1 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 | cut -d' ' -f1 | sort > .lfs-assets-id + run: | + 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 - name: Restore LFS cache uses: actions/cache@v3 @@ -44,6 +48,7 @@ jobs: - name: Git LFS Pull run: | git lfs pull + git submodule foreach git lfs pull git add . git reset --hard 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(); }