Merge commit '98d605298ddef164543a3907a95581715302e98d' into remove-non-det

Author: leeyi45

.github/workflows/build-development.yml

@@ -11,6 +11,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      # Has to be run before actions/setup-node.
+      # See: https://github.com/actions/setup-node/issues/480
+      - name: Enable corepack for Yarn
+        run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/ci.yml

@@ -26,6 +26,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      # Has to be run before actions/setup-node.
+      # See: https://github.com/actions/setup-node/issues/480
+      - name: Enable corepack for Yarn
+        run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.tool-versions

@@ -0,0 +1 @@
+nodejs v20.18.1

package.json

@@ -48,7 +48,7 @@
     "browserfs": "^1.4.3",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.13",
-    "dompurify": "^3.1.6",
+    "dompurify": "^3.2.4",
     "flexboxgrid": "^6.3.1",
     "flexboxgrid-helpers": "^1.1.3",
     "hastscript": "^9.0.0",

src/features/cseMachine/CseMachineUtils.ts

@@ -756,7 +756,7 @@ export function getControlItemComponent(
       case InstrType.BRANCH:
         return new ControlItemComponent(
           'branch',
-          'Pop boolean value from stash and execute corresponding branch',
+          'Branch to the consequent or alternative',
           stackHeight,
           highlightOnHover,
           unhighlightOnHover,

src/features/game/effects/GlowingObject.ts

@@ -88,6 +88,14 @@ export default class GlowingImage {
     this.blinkClearer?.();
   }
 
+  public hoverGlowStart() {
+    this.imageGlow.setAlpha(0.5);
+  }
+
+  public hoverGlowEnd() {
+    this.imageGlow.setAlpha(0);
+  }
+
   public getContainer() {
     return this.container;
   }

src/features/game/mode/explore/GameModeExplore.ts

@@ -103,7 +103,10 @@ class GameModeExplore implements IGameUI {
         if (!activatable.actionIds || !activatable.actionIds.length) {
           return;
         }
-        activatable.clickArea.on('pointerout', () => this.explorePointerOut());
+
+        activatable.clickArea.on('pointerout', () =>
+          this.explorePointerOut(activatable.interactionId)
+        );
         activatable.clickArea.on('pointerover', () =>
           this.explorePointerOver(activatable.interactionId)
         );
@@ -138,6 +141,8 @@ class GameModeExplore implements IGameUI {
    */
   private explorePointerOver(id: ItemId) {
     const hasTriggered = GameGlobalAPI.getInstance().hasTriggeredInteraction(id);
+    GameGlobalAPI.getInstance().objectHoverGlow(id, true);
+
     if (hasTriggered) {
       GameGlobalAPI.getInstance().setDefaultCursor(ExploreModeConstants.checked);
     } else {
@@ -149,8 +154,9 @@ class GameModeExplore implements IGameUI {
    * Function to be executed when user off hover upon interactable object/bbox.
    * It sets the cursor back to 'Explore' mode cursor.
    */
-  private explorePointerOut() {
+  private explorePointerOut(id: ItemId) {
     GameGlobalAPI.getInstance().setDefaultCursor(ExploreModeConstants.normal);
+    GameGlobalAPI.getInstance().objectHoverGlow(id, false);
   }
 
   /**
@@ -163,6 +169,7 @@ class GameModeExplore implements IGameUI {
    */
   private explorePointerUp(id: string) {
     GameGlobalAPI.getInstance().setDefaultCursor(Constants.defaultCursor);
+    GameGlobalAPI.getInstance().objectHoverGlow(id, false);
     GameGlobalAPI.getInstance().triggerInteraction(id);
     GameGlobalAPI.getInstance().setDefaultCursor(ExploreModeConstants.normal);
   }

src/features/game/objects/GameObjectManager.ts

@@ -79,6 +79,23 @@ class GameObjectManager implements StateObserver {
     }
   }
 
+  /**
+   * Apply glow effect on the object, for when it's hovered on
+   *
+   * @param objectId id of the object
+   */
+  public objectHoverGlow(objectId: ItemId, turnOn: boolean) {
+    const object = this.objects.get(objectId);
+    if (!object) {
+      return;
+    }
+    if (turnOn) {
+      (object.sprite as GlowingImage).hoverGlowStart();
+    } else {
+      (object.sprite as GlowingImage).hoverGlowEnd();
+    }
+  }
+
   /**
    * Create the object from the given object property.
    * Because we want this sprite to be activatable

src/features/game/scenes/gameManager/GameGlobalAPI.ts

@@ -135,6 +135,10 @@ class GameGlobalAPI {
     this.getGameManager().getObjectManager().makeObjectBlink(objectId, turnOn);
   }
 
+  public objectHoverGlow(objectId: ItemId, turnOn: boolean) {
+    this.getGameManager().getObjectManager().objectHoverGlow(objectId, turnOn);
+  }
+
   public setObjProperty(id: ItemId, newObjProp: ObjectProperty) {
     this.getGameManager().getStateManager().setObjProperty(id, newObjProp);
   }

src/pages/contributors/subcomponents/ContributorsDetails.tsx

@@ -11,17 +11,17 @@ const ContributorsDetails: React.FC = () => (
     <Card className={classes['contributorsDetails']} elevation={Elevation.ONE}>
       <H3>The Team behind the Source Academy</H3>
       <p className={classes['description']}>
-        The <i>Source Academy</i> is designed and developed by a team of students, most of who have
+        The <i>Source Academy</i> is designed and developed by a team of students, most of whom have
         used the system to learn the fundamentals of computing and enjoyed it. This page includes
-        all developers who contributed to the Source Academy <i>Strange</i> (2024) and its
-        precursors <i>Merlin</i> (2023), <i>Rook</i> (2022), <i>Knight</i> (2020) and <i>Cadet</i>{' '}
-        (2018). These versions succeeded Source Academy 2 (2017) and ultimately the original Source
-        Academy (2016).
+        all developers who contributed to the Source Academy <i>Charm</i> (2025) and its precursors{' '}
+        <i>Strange</i> (2024), <i>Merlin</i> (2023), <i>Rook</i> (2022), <i>Knight</i> (2020) and{' '}
+        <i>Cadet</i> (2018). These versions succeeded Source Academy 2 (2017) and ultimately the
+        original Source Academy (2016).
       </p>
       <div className={classes['leadership']}>
         <H5>
           <strong>
-            <u>2024 Leadership (Strange)</u>
+            <u>2025 Leadership (Charm)</u>
           </strong>
         </H5>
         <p>
@@ -37,7 +37,7 @@ const ContributorsDetails: React.FC = () => (
         </p>
         {dot}
         <p>
-          Richard Dominick
+          Gabriel Chang
           <br />
           <strong>(Backend)</strong>
         </p>
@@ -313,6 +313,49 @@ const ContributorsDetails: React.FC = () => (
           <strong>(Robotics)</strong>
         </p>
       </div>
+
+      <div className={classes['leadership']}>
+        <p className={classes['evenWider']}>
+          <strong>2024 Leadership (Strange)</strong>
+        </p>
+        <br />
+
+        <p>
+          Richard Dominick
+          <br />
+          <strong>(CTO)</strong>
+        </p>
+        {dot}
+        <p>
+          Zhang Yao
+          <br />
+          <strong>(Frontend)</strong>
+        </p>
+        {dot}
+        <p>
+          Richard Dominick
+          <br />
+          <strong>(Backend)</strong>
+        </p>
+        {dot}
+        <p>
+          Lee Hyung Woon
+          <br />
+          <strong>(Game)</strong>
+        </p>
+        {dot}
+        <p>
+          Kyriel Mortel Abad
+          <br />
+          <strong>(Languages)</strong>
+        </p>
+        {dot}
+        <p>
+          Lee Yi
+          <br />
+          <strong>(Modules)</strong>
+        </p>
+      </div>
       <div className={classes['contributors']}>
         <H5>
           <strong>