Merge pull request #147 from vircadia/master

Bring `engine` branch up to speed with `master`.
vircadia · Mar 10, 2023 · 3546b48 · 3546b48
2 parents 8b87096 + 0786a34
commit 3546b48
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/learnaverse_demo.yml b/.github/workflows/learnaverse_demo.yml
@@ -7,7 +7,7 @@ on:
   # Allows this workflow to be run manually from the Actions tab.
   workflow_dispatch:
 
-name: 🚀 Auto-Deploy
+name: 🚀 Auto-Deploy (Learnaverse)
 jobs:
   web-deploy:
     name: 🎉 Deploy
@@ -17,6 +17,8 @@ jobs:
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@master
+      with:
+        node-version: 16.x
 
     - name: 📥 Install project dependencies
       run: npm install

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,6 +17,8 @@ jobs:
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@master
+      with:
+        node-version: 16.x
 
     - name: 📥 Install project dependencies
       run: npm install

diff --git a/.github/workflows/pr_to_master_deploy.yml b/.github/workflows/pr_to_master_deploy.yml
@@ -17,6 +17,8 @@ jobs:
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@master
+      with:
+        node-version: 16.x
 
     - name: 📥 Install project dependencies
       run: npm install

diff --git a/.github/workflows/ua92_demo.yml b/.github/workflows/ua92_demo.yml
@@ -7,7 +7,7 @@ on:
   # Allows this workflow to be run manually from the Actions tab.
   workflow_dispatch:
 
-name: 🚀 Auto-Deploy
+name: 🚀 Auto-Deploy (UA92)
 jobs:
   web-deploy:
     name: 🎉 Deploy
@@ -27,6 +27,8 @@ jobs:
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@master
+      with:
+        node-version: 16.x
 
     - name: 📥 Install project dependencies
       run: npm install

diff --git a/src/modules/avatar/controller/inputs/keyboardInput.ts b/src/modules/avatar/controller/inputs/keyboardInput.ts
@@ -172,7 +172,7 @@ export class KeyboardInput implements IInputHandler {
         }
 
         // Sit.
-        if (evt.sourceEvent.code === Store.state.controls.movement.sit?.keybind) {
+        if (evt.sourceEvent.code === Store.state.controls.keyboard.movement.sit?.keybind) {
             const sitDistanceLimit = 1.5;
 
             // Get the player's avatar mesh.
@@ -242,13 +242,13 @@ export class KeyboardInput implements IInputHandler {
         }
 
         // Clap.
-        if (evt.sourceEvent.code === Store.state.controls.movement.clap?.keybind) {
+        if (evt.sourceEvent.code === Store.state.controls.keyboard.movement.clap?.keybind) {
             this._state.state = State.Pose;
             this._state.action = Action.Clap;
         }
 
         // Salute.
-        if (evt.sourceEvent.code === Store.state.controls.movement.salute?.keybind) {
+        if (evt.sourceEvent.code === Store.state.controls.keyboard.movement.salute?.keybind) {
             this._state.state = State.Pose;
             this._state.action = Action.Salute;
         }
@@ -286,7 +286,7 @@ export class KeyboardInput implements IInputHandler {
 
         // Clap.
         if (
-            evt.sourceEvent.code === Store.state.controls.movement.clap?.keybind
+            evt.sourceEvent.code === Store.state.controls.keyboard.movement.clap?.keybind
             && this._state.state === State.Pose
             && this._state.action === Action.Clap
         ) {
@@ -296,7 +296,7 @@ export class KeyboardInput implements IInputHandler {
 
         // Salute.
         if (
-            evt.sourceEvent.code === Store.state.controls.movement.salute?.keybind
+            evt.sourceEvent.code === Store.state.controls.keyboard.movement.salute?.keybind
             && this._state.state === State.Pose
             && this._state.action === Action.Salute
         ) {