diff --git a/front/dist/resources/customisation/character_accessories/wheelchair.png b/front/dist/resources/customisation/character_accessories/wheelchair.png new file mode 100644 index 00000000..47fe9a8a Binary files /dev/null and b/front/dist/resources/customisation/character_accessories/wheelchair.png differ diff --git a/front/src/Components/LayoutManager/LayoutManager.svelte b/front/src/Components/LayoutManager/LayoutManager.svelte index 0d5c4d2c..0c26ca98 100644 --- a/front/src/Components/LayoutManager/LayoutManager.svelte +++ b/front/src/Components/LayoutManager/LayoutManager.svelte @@ -6,7 +6,7 @@ callback(); } - function sanitize(html : string) { + function sanitize(html) { return HtmlUtils.sanitize(html); } diff --git a/front/src/Phaser/Entity/PlayerTextures.ts b/front/src/Phaser/Entity/PlayerTextures.ts index b144438c..7857b513 100644 --- a/front/src/Phaser/Entity/PlayerTextures.ts +++ b/front/src/Phaser/Entity/PlayerTextures.ts @@ -434,7 +434,14 @@ export const ACCESSORIES_RESOURCES: BodyResourceDescriptionListInterface = { name: "accessory_mate_bottle", img: "resources/customisation/character_accessories/mate_bottle1.png", }, - accessory_mask: { name: "accessory_mask", img: "resources/customisation/character_accessories/mask.png" }, + accessory_mask: { + name: "accessory_mask", + img: "resources/customisation/character_accessories/mask.png", + }, + wheelchair: { + name: "accessory_wheelchair", + img: "resources/customisation/character_accessories/wheelchair.png", + }, }; export const LAYERS: BodyResourceDescriptionListInterface[] = [ diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index 4a2691b5..e34c2033 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -232,6 +232,8 @@ export class GameScene extends DirtyScene { //initialize frame event of scripting API this.listenToIframeEvents(); + layoutManagerActionStore.clearActions(); + const localUser = localUserStore.getLocalUser(); const textures = localUser?.textures; if (textures) { @@ -1920,10 +1922,10 @@ export class GameScene extends DirtyScene { layoutManagerActionStore.removeAction("jitsi"); } else { const openJitsiRoomFunction = () => { - const roomName = jitsiFactory.getRoomName(allProps.get("jitsiRoom") as string, this.instance); - const jitsiUrl = allProps.get("jitsiUrl") as string | undefined; + const roomName = jitsiFactory.getRoomName(allProps.get(GameMapProperties.JITSI_ROOM) as string, this.instance); + const jitsiUrl = allProps.get(GameMapProperties.JITSI_URL) as string | undefined; if (JITSI_PRIVATE_MODE && !jitsiUrl) { - const adminTag = allProps.get("jitsiRoomAdminTag") as string | undefined; + const adminTag = allProps.get(GameMapProperties.JITSI_ADMIN_ROOM_TAG) as string | undefined; this.connection && this.connection.emitQueryJitsiJwtMessage(roomName, adminTag); } else {