_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

latest dev

Browse Source
This commit is contained in:
_Bastler 2021-11-05 18:44:33 +01:00
parent af855344f4
commit 0d811db668
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
front/dist/resources/customisation/character_accessories/wheelchair.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

2
front/src/Components/LayoutManager/LayoutManager.svelte
View File

@ -6,7 +6,7 @@
callback(); callback();
} }
function sanitize(html : string) { function sanitize(html) {
return HtmlUtils.sanitize(html); return HtmlUtils.sanitize(html);
} }
</script> </script>

9
front/src/Phaser/Entity/PlayerTextures.ts
View File

@ -434,7 +434,14 @@ export const ACCESSORIES_RESOURCES: BodyResourceDescriptionListInterface = {
name: "accessory_mate_bottle", name: "accessory_mate_bottle",
img: "resources/customisation/character_accessories/mate_bottle1.png", 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[] = [ export const LAYERS: BodyResourceDescriptionListInterface[] = [

8
front/src/Phaser/Game/GameScene.ts
View File

@ -232,6 +232,8 @@ export class GameScene extends DirtyScene {
//initialize frame event of scripting API //initialize frame event of scripting API
this.listenToIframeEvents(); this.listenToIframeEvents();
layoutManagerActionStore.clearActions();
const localUser = localUserStore.getLocalUser(); const localUser = localUserStore.getLocalUser();
const textures = localUser?.textures; const textures = localUser?.textures;
if (textures) { if (textures) {
@ -1920,10 +1922,10 @@ export class GameScene extends DirtyScene {
layoutManagerActionStore.removeAction("jitsi"); layoutManagerActionStore.removeAction("jitsi");
} else { } else {
const openJitsiRoomFunction = () => { const openJitsiRoomFunction = () => {
const roomName = jitsiFactory.getRoomName(allProps.get("jitsiRoom") as string, this.instance); const roomName = jitsiFactory.getRoomName(allProps.get(GameMapProperties.JITSI_ROOM) as string, this.instance);
const jitsiUrl = allProps.get("jitsiUrl") as string | undefined; const jitsiUrl = allProps.get(GameMapProperties.JITSI_URL) as string | undefined;
if (JITSI_PRIVATE_MODE && !jitsiUrl) { 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); this.connection && this.connection.emitQueryJitsiJwtMessage(roomName, adminTag);
} else { } else {