From 6a4e0e519c3d8dca158e1a93d2ba57f9c45f17c2 Mon Sep 17 00:00:00 2001 From: Datalog-Mindhack Date: Mon, 18 Oct 2021 21:59:36 +0530 Subject: [PATCH 1/3] Changes in README file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25674e0..3d2431e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The project will run at http://localhost:8080/ ## Licenses -This project contains multiple licenses: +This project contains multiple licenses as follows: * [Code license](./LICENSE.code) *(all files except those for other licenses)* * [Map license](./LICENSE.map) *(`map.json` and the map visual as well)* @@ -29,4 +29,4 @@ This project contains multiple licenses: If you add third party assets in your map, do not forget to: 1. Credit the author and license with the "tilesetCopyright" property present in the properties of each tilesets in the `map.json` file -2. Add the license text in LICENSE.assets \ No newline at end of file +2. Add the license text in LICENSE.assets From 8139a7f9c1d7c70bdc6bdba5a81ebfde1c89fc33 Mon Sep 17 00:00:00 2001 From: Florent Torregrosa Date: Tue, 8 Feb 2022 21:21:54 +0100 Subject: [PATCH 2/3] Issue #32: Update the clock when reopening the popup. --- src/index.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index 794861d..df38a6b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,12 +6,11 @@ import {bootstrapExtra} from "@workadventure/scripting-api-extra"; bootstrapExtra().catch(e => console.error(e)); let currentPopup: any = undefined; -const today = new Date(); -const time = today.getHours() + ":" + today.getMinutes(); WA.room.onEnterLayer('clockZone').subscribe(() => { - console.log('toto') - currentPopup = WA.ui.openPopup("clockPopup","It's " + time,[]); + const today = new Date(); + const time = today.getHours() + ":" + today.getMinutes(); + currentPopup = WA.ui.openPopup("clockPopup","It's " + time,[]); }) WA.room.onLeaveLayer('clockZone').subscribe(closePopUp) From ced9867215d2fbd9606a31770bb467582ff35762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 09:56:56 +0000 Subject: [PATCH 3/3] Bump follow-redirects from 1.14.7 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b55714d..e71a907 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2131,9 +2131,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true, "funding": [ { @@ -7022,9 +7022,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true }, "forwarded": { @@ -9099,7 +9099,9 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "requires": {} + "requires": { + "ajv": "^8.0.0" + } }, "ajv-keywords": { "version": "5.1.0", @@ -9184,7 +9186,9 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "requires": {} + "requires": { + "ajv": "^8.0.0" + } }, "ajv-keywords": { "version": "5.1.0",