diff --git a/docs/maps/menu.php b/docs/maps/menu.php index b8d0e638..c8afc2c0 100644 --- a/docs/maps/menu.php +++ b/docs/maps/menu.php @@ -141,6 +141,12 @@ return [ 'markdown' => 'maps.api-controls', 'editUrl' => 'https://github.com/thecodingmachine/workadventure/edit/develop/docs/maps/api-controls.md', ], + [ + 'title' => 'Camera', + 'url' => '/map-building/api-camera.md', + 'markdown' => 'maps.api-camera', + 'editUrl' => 'https://github.com/thecodingmachine/workadventure/edit/develop/docs/maps/api-camera.md', + ], [ 'title' => 'Deprecated', 'url' => '/map-building/api-deprecated.md', diff --git a/front/index.html b/front/index.html index a8157730..378f5a84 100644 --- a/front/index.html +++ b/front/index.html @@ -28,7 +28,6 @@ - diff --git a/front/package.json b/front/package.json index 4c673e29..60d1d8d5 100644 --- a/front/package.json +++ b/front/package.json @@ -32,6 +32,7 @@ "vite-plugin-rewrite-all": "^0.1.2" }, "dependencies": { + "@16bits/nes.css": "^2.3.2", "@fontsource/press-start-2p": "^4.3.0", "@joeattardi/emoji-button": "^4.6.2", "@types/simple-peer": "^9.11.1", diff --git a/front/src/Components/Menu/TextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte index ec3e7039..6b42e42e 100644 --- a/front/src/Components/Menu/TextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -76,7 +76,3 @@
- - diff --git a/front/src/Phaser/Entity/RemotePlayer.ts b/front/src/Phaser/Entity/RemotePlayer.ts index 7af6da2e..a2ca63ea 100644 --- a/front/src/Phaser/Entity/RemotePlayer.ts +++ b/front/src/Phaser/Entity/RemotePlayer.ts @@ -7,6 +7,7 @@ import type { PlayerAnimationDirections } from "../Player/Animation"; import type { Unsubscriber } from "svelte/store"; import type { ActivatableInterface } from "../Game/ActivatableInterface"; import type CancelablePromise from "cancelable-promise"; +import LL from "../../i18n/i18n-svelte"; /** * Class representing the sprite of a remote player (a player that plays on another computer) @@ -107,7 +108,7 @@ export class RemotePlayer extends Character implements ActivatableInterface { private registerDefaultActionsMenuActions(): void { if (this.visitCardUrl) { this.registeredActions.push({ - actionName: "Visiting Card", + actionName: LL.woka.menu.businessCard(), callback: () => { requestVisitCardsStore.set(this.visitCardUrl); actionsMenuStore.clear(); diff --git a/front/src/i18n/de-DE/index.ts b/front/src/i18n/de-DE/index.ts index 40b63558..a72ecc1f 100644 --- a/front/src/i18n/de-DE/index.ts +++ b/front/src/i18n/de-DE/index.ts @@ -12,6 +12,7 @@ import menu from "./menu"; import report from "./report"; import warning from "./warning"; import woka from "./woka"; +import trigger from "./trigger"; const de_DE: Translation = { ...(en_US as Translation), @@ -29,6 +30,7 @@ const de_DE: Translation = { report, warning, emoji, + trigger, }; export default de_DE; diff --git a/front/src/i18n/de-DE/menu.ts b/front/src/i18n/de-DE/menu.ts index 5e695d95..c1b7bc18 100644 --- a/front/src/i18n/de-DE/menu.ts +++ b/front/src/i18n/de-DE/menu.ts @@ -70,7 +70,7 @@ const menu: NonNullable = { description: "Link zu diesem Raum teilen!", copy: "Kopieren", share: "Teilen", - walk_automatically_to_position: "Walk automatically to my position", + walk_automatically_to_position: "Automatisch zu meiner Position gehen", }, globalMessage: { text: "Text", diff --git a/front/src/i18n/de-DE/trigger.ts b/front/src/i18n/de-DE/trigger.ts new file mode 100644 index 00000000..9239c0fc --- /dev/null +++ b/front/src/i18n/de-DE/trigger.ts @@ -0,0 +1,9 @@ +import type { Translation } from "../i18n-types"; + +const trigger: NonNullable = { + cowebsite: "Drücke LEERTASTE oder tippe hier um die Webseite zu öffnen", + newTab: "Drücke LEERTASTE oder tippe hier um die Webseite in einem neuen Tab zu öffnen", + jitsiRoom: "Drücke LEERTASTE oder tippe hier um dem Jitsi Meet Raum beizutreten", +}; + +export default trigger; diff --git a/front/src/i18n/de-DE/woka.ts b/front/src/i18n/de-DE/woka.ts index 640cd756..98046f3b 100644 --- a/front/src/i18n/de-DE/woka.ts +++ b/front/src/i18n/de-DE/woka.ts @@ -15,6 +15,9 @@ const woka: NonNullable = { continue: "Auswählen", customize: "Bearbeite dein WOKA", }, + menu: { + businessCard: "Visitenkarte", + }, }; export default woka; diff --git a/front/src/i18n/en-US/woka.ts b/front/src/i18n/en-US/woka.ts index 6c1e02ad..ac4aaa64 100644 --- a/front/src/i18n/en-US/woka.ts +++ b/front/src/i18n/en-US/woka.ts @@ -15,6 +15,9 @@ const woka: BaseTranslation = { continue: "Continue", customize: "Customize your WOKA", }, + menu: { + businessCard: "Business Card", + }, }; export default woka; diff --git a/front/src/i18n/fr-FR/woka.ts b/front/src/i18n/fr-FR/woka.ts index 36ef463b..3225a8a2 100644 --- a/front/src/i18n/fr-FR/woka.ts +++ b/front/src/i18n/fr-FR/woka.ts @@ -15,6 +15,9 @@ const woka: NonNullable = { continue: "Continuer", customize: "Personnalisez votre WOKA", }, + menu: { + businessCard: "Carte de visite", + }, }; export default woka; diff --git a/front/style/TextGlobalMessageSvelte-Style.scss b/front/style/TextGlobalMessageSvelte-Style.scss index 4baa8c8a..94baa67a 100644 --- a/front/style/TextGlobalMessageSvelte-Style.scss +++ b/front/style/TextGlobalMessageSvelte-Style.scss @@ -1,4 +1,8 @@ //TextGlobalMessage + +// TODO: load on demand with TextGlobalMessage component +@import "quill/dist/quill.snow.css"; + section.section-input-send-text { --height-toolbar: 20%; height: 100%; diff --git a/front/style/fonts.scss b/front/style/fonts.scss index 280f0a36..24836081 100644 --- a/front/style/fonts.scss +++ b/front/style/fonts.scss @@ -1,4 +1,5 @@ @import "@fontsource/press-start-2p/index.css"; +@import "@16bits/nes.css/css/nes.min.css"; *{ font-family: PixelFont-7,monospace; diff --git a/front/yarn.lock b/front/yarn.lock index 369c129b..299be710 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@16bits/nes.css@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@16bits/nes.css/-/nes.css-2.3.2.tgz#e69db834119b33ae8d3cb044f106a07a17cadd6f" + integrity sha512-nEM5PIth+Bab5JSOa4uUR+PMNUsNTYxA55oVlG3gXI/4LoYtWS767Uv9Pu/KCbHXVvnIjt4ZXt13kZw3083qTw== + "@babel/code-frame@^7.0.0": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"