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

2021-12-07 10:48:24 +01:00
parent 576f027f9e 2f8bd52dba
commit 3e1fefef1e
4 changed files with 29 additions and 3 deletions
@@ -870,7 +870,8 @@ export class GameScene extends DirtyScene {
                };

                const jitsiTriggerValue = allProps.get(GameMapProperties.JITSI_TRIGGER);
-                if (jitsiTriggerValue && jitsiTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
+                const forceTrigger = localUserStore.getForceCowebsiteTrigger();
+                if (forceTrigger || jitsiTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
                    let message = allProps.get(GameMapProperties.JITSI_TRIGGER_MESSAGE);
                    if (message === undefined) {
                        message = "Press SPACE or touch here to enter Jitsi Meet room";