Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring engine branch up to speed with master. #147

Merged
merged 5 commits into from
Mar 10, 2023
Merged

Bring engine branch up to speed with master. #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4be1750
Merge pull request #137 from vircadia/engine
Gigabyte5671 Feb 26, 2023
fd3babe
Update main.yml
Gigabyte5671 Mar 2, 2023
1bb8164
Fix regression related to the new control settings schema
Gigabyte5671 Mar 2, 2023
cdae12e
Use Node 16 for all workflows
Gigabyte5671 Mar 2, 2023
0786a34
Clarify workflow names
Gigabyte5671 Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/learnaverse_demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr_to_master_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ua92_demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/modules/avatar/controller/inputs/keyboardInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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
) {
Expand All @@ -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
) {
Expand Down