Merge pull request #289 from JernejHabjan/develop

#275-sprite-foundation and mobile fixes
JernejHabjan · Feb 9, 2025 · f038522 · f038522
2 parents 75ceef2 + f2f2f93
commit f038522
Show file tree

Hide file tree

Showing 228 changed files with 6,839 additions and 2,031 deletions.
diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - main
       - develop
+
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -14,8 +18,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      #  with:
-      #    fetch-depth: 0
+        with:
+          fetch-depth: 50
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -37,9 +41,18 @@ jobs:
 
       - name: Run linter
         run: pnpm run lint
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Run tests
         run: pnpm run test
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Build Packages
         run: pnpm run build-gh-pages
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [ develop ]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,8 +16,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        #  with:
-        #    fetch-depth: 0
+        with:
+          fetch-depth: 50
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -36,15 +39,25 @@ jobs:
 
       - name: Run linter
         run: pnpm run lint
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Run tests
         run: pnpm run test
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Build Packages
         run: pnpm run build-gh-pages
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Setup Pages
         uses: actions/configure-pages@v5
+
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [ main ]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,8 +16,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      #  with:
-      #    fetch-depth: 0
+        with:
+          fetch-depth: 50
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -36,12 +39,21 @@ jobs:
 
       - name: Run linter
         run: pnpm run lint
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Run tests
         run: pnpm run test
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Build Packages
         run: pnpm run build-gh-pages
+        env:
+          NX_BRANCH: ${{ github.event.number }}
+          NX_RUN_GROUP: ${{ github.run_id }}
 
       - name: Setup Pages
         uses: actions/configure-pages@v5

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
diff --git a/apps/client/src/app/home/music/music.component.scss b/apps/client/src/app/home/music/music.component.scss
@@ -4,9 +4,10 @@
   flex-direction: column;
   gap: 1rem;
   padding: 1rem;
-  max-width: 800px;
+  max-width: 80%;
   width: 800px;
   margin: 0 auto;
+  overflow: auto;
 }
 
 .music-item {
@@ -33,5 +34,4 @@
 
 .audio-player {
   width: 100%;
-  max-width: 800px;
 }
diff --git a/apps/client/src/app/probable-waffle/game/data/actor-component.ts b/apps/client/src/app/probable-waffle/game/data/actor-component.ts
@@ -2,9 +2,6 @@ import GameObject = Phaser.GameObjects.GameObject;
 import { ActorData, ActorDataKey } from "./actor-data";
 
 export function getActorComponent<T>(actor: GameObject, componentClass: new (...args: any[]) => T): T | undefined {
-  const component = (actor.getData(ActorDataKey) as ActorData)?.components?.find((c) => c instanceof componentClass);
-  if (!component) {
-    return undefined;
-  }
-  return component;
+  const actorData = actor.getData(ActorDataKey) as ActorData;
+  return actorData?.components.get(componentClass);
 }