Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop

This commit is contained in:
_Bastler
2022-04-13 16:42:40 +02:00
15 changed files with 144 additions and 96 deletions
+1
View File
@@ -45,6 +45,7 @@
"deep-copy-ts": "^0.5.0",
"dompurify" : "^2.3.6",
"easystarjs": "^0.4.4",
"fast-deep-equal": "^3.1.3",
"google-protobuf": "^3.13.0",
"phaser": "3.55.1",
"phaser-animated-tiles": "workadventure/phaser-animated-tiles#da68bbededd605925621dd4f03bd27e69284b254",
@@ -9,5 +9,8 @@
"license": "MIT",
"publishConfig": {
"access": "public"
},
"dependencies": {
"rxjs": "^6.6.3"
}
}
+6 -1
View File
@@ -178,6 +178,7 @@ export class GameScene extends DirtyScene {
private localVolumeStoreUnsubscriber: Unsubscriber | undefined;
private followUsersColorStoreUnsubscribe!: Unsubscriber;
private currentPlayerGroupIdStoreUnsubscribe!: Unsubscriber;
private privacyShutdownStoreUnsubscribe!: Unsubscriber;
private userIsJitsiDominantSpeakerStoreUnsubscriber!: Unsubscriber;
private jitsiParticipantsCountStoreUnsubscriber!: Unsubscriber;
@@ -222,8 +223,8 @@ export class GameScene extends DirtyScene {
private loader: Loader;
private lastCameraEvent: WasCameraUpdatedEvent | undefined;
private firstCameraUpdateSent: boolean = false;
private showVoiceIndicatorChangeMessageSent: boolean = false;
private currentPlayerGroupId?: number;
private showVoiceIndicatorChangeMessageSent: boolean = false;
private jitsiDominantSpeaker: boolean = false;
private jitsiParticipantsCount: number = 0;
public readonly superLoad: SuperLoaderPlugin;
@@ -858,6 +859,10 @@ export class GameScene extends DirtyScene {
this.currentPlayerGroupId = message.groupId;
});
this.connection.groupUsersUpdateMessageStream.subscribe((message) => {
this.currentPlayerGroupId = message.groupId;
});
/**
* Triggered when we receive the JWT token to connect to Jitsi
*/
+4 -3
View File
@@ -11,6 +11,7 @@ import { peerStore } from "./PeerStore";
import { privacyShutdownStore } from "./PrivacyShutdownStore";
import { MediaStreamConstraintsError } from "./Errors/MediaStreamConstraintsError";
import { SoundMeter } from "../Phaser/Components/SoundMeter";
import deepEqual from "fast-deep-equal";
/**
* A store that contains the camera state requested by the user (on or off).
@@ -314,10 +315,10 @@ export const mediaStreamConstraintsStore = derived(
currentAudioConstraint = false;
}
// Let's make the changes only if the new value is different from the old one.
// Let's make the changes only if the new value is different from the old one.tile
if (
previousComputedVideoConstraint != currentVideoConstraint ||
previousComputedAudioConstraint != currentAudioConstraint
!deepEqual(previousComputedVideoConstraint, currentVideoConstraint) ||
!deepEqual(previousComputedAudioConstraint, currentAudioConstraint)
) {
previousComputedVideoConstraint = currentVideoConstraint;
previousComputedAudioConstraint = currentAudioConstraint;