Merge branch 'develop' into vite

This commit is contained in:
Lukas Hass
2022-02-14 19:46:30 +01:00
14 changed files with 40 additions and 7 deletions
+6
View File
@@ -141,6 +141,12 @@ return [
'markdown' => 'maps.api-controls', 'markdown' => 'maps.api-controls',
'editUrl' => 'https://github.com/thecodingmachine/workadventure/edit/develop/docs/maps/api-controls.md', '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', 'title' => 'Deprecated',
'url' => '/map-building/api-deprecated.md', 'url' => '/map-building/api-deprecated.md',
-1
View File
@@ -28,7 +28,6 @@
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<base href="/"> <base href="/">
<link href="https://unpkg.com/nes.css@2.3.0/css/nes.min.css" rel="stylesheet" />
<script>/*polyfill for simple-peer*/window.global = window; window.process = { env: {}};</script> <script>/*polyfill for simple-peer*/window.global = window; window.process = { env: {}};</script>
<style>/*hide cowebsite container before scss is loaded*/#cowebsite { visibility: collapse };</style> <style>/*hide cowebsite container before scss is loaded*/#cowebsite { visibility: collapse };</style>
+1
View File
@@ -32,6 +32,7 @@
"vite-plugin-rewrite-all": "^0.1.2" "vite-plugin-rewrite-all": "^0.1.2"
}, },
"dependencies": { "dependencies": {
"@16bits/nes.css": "^2.3.2",
"@fontsource/press-start-2p": "^4.3.0", "@fontsource/press-start-2p": "^4.3.0",
"@joeattardi/emoji-button": "^4.6.2", "@joeattardi/emoji-button": "^4.6.2",
"@types/simple-peer": "^9.11.1", "@types/simple-peer": "^9.11.1",
@@ -76,7 +76,3 @@
<section class="section-input-send-text"> <section class="section-input-send-text">
<div class="input-send-text" bind:this={QUILL_EDITOR} /> <div class="input-send-text" bind:this={QUILL_EDITOR} />
</section> </section>
<style lang="scss">
@import "https://cdn.quilljs.com/1.3.7/quill.snow.css";
</style>
+2 -1
View File
@@ -7,6 +7,7 @@ import type { PlayerAnimationDirections } from "../Player/Animation";
import type { Unsubscriber } from "svelte/store"; import type { Unsubscriber } from "svelte/store";
import type { ActivatableInterface } from "../Game/ActivatableInterface"; import type { ActivatableInterface } from "../Game/ActivatableInterface";
import type CancelablePromise from "cancelable-promise"; 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) * 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 { private registerDefaultActionsMenuActions(): void {
if (this.visitCardUrl) { if (this.visitCardUrl) {
this.registeredActions.push({ this.registeredActions.push({
actionName: "Visiting Card", actionName: LL.woka.menu.businessCard(),
callback: () => { callback: () => {
requestVisitCardsStore.set(this.visitCardUrl); requestVisitCardsStore.set(this.visitCardUrl);
actionsMenuStore.clear(); actionsMenuStore.clear();
+2
View File
@@ -12,6 +12,7 @@ import menu from "./menu";
import report from "./report"; import report from "./report";
import warning from "./warning"; import warning from "./warning";
import woka from "./woka"; import woka from "./woka";
import trigger from "./trigger";
const de_DE: Translation = { const de_DE: Translation = {
...(en_US as Translation), ...(en_US as Translation),
@@ -29,6 +30,7 @@ const de_DE: Translation = {
report, report,
warning, warning,
emoji, emoji,
trigger,
}; };
export default de_DE; export default de_DE;
+1 -1
View File
@@ -70,7 +70,7 @@ const menu: NonNullable<Translation["menu"]> = {
description: "Link zu diesem Raum teilen!", description: "Link zu diesem Raum teilen!",
copy: "Kopieren", copy: "Kopieren",
share: "Teilen", share: "Teilen",
walk_automatically_to_position: "Walk automatically to my position", walk_automatically_to_position: "Automatisch zu meiner Position gehen",
}, },
globalMessage: { globalMessage: {
text: "Text", text: "Text",
+9
View File
@@ -0,0 +1,9 @@
import type { Translation } from "../i18n-types";
const trigger: NonNullable<Translation["trigger"]> = {
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;
+3
View File
@@ -15,6 +15,9 @@ const woka: NonNullable<Translation["woka"]> = {
continue: "Auswählen", continue: "Auswählen",
customize: "Bearbeite dein WOKA", customize: "Bearbeite dein WOKA",
}, },
menu: {
businessCard: "Visitenkarte",
},
}; };
export default woka; export default woka;
+3
View File
@@ -15,6 +15,9 @@ const woka: BaseTranslation = {
continue: "Continue", continue: "Continue",
customize: "Customize your WOKA", customize: "Customize your WOKA",
}, },
menu: {
businessCard: "Business Card",
},
}; };
export default woka; export default woka;
+3
View File
@@ -15,6 +15,9 @@ const woka: NonNullable<Translation["woka"]> = {
continue: "Continuer", continue: "Continuer",
customize: "Personnalisez votre WOKA", customize: "Personnalisez votre WOKA",
}, },
menu: {
businessCard: "Carte de visite",
},
}; };
export default woka; export default woka;
@@ -1,4 +1,8 @@
//TextGlobalMessage //TextGlobalMessage
// TODO: load on demand with TextGlobalMessage component
@import "quill/dist/quill.snow.css";
section.section-input-send-text { section.section-input-send-text {
--height-toolbar: 20%; --height-toolbar: 20%;
height: 100%; height: 100%;
+1
View File
@@ -1,4 +1,5 @@
@import "@fontsource/press-start-2p/index.css"; @import "@fontsource/press-start-2p/index.css";
@import "@16bits/nes.css/css/nes.min.css";
*{ *{
font-family: PixelFont-7,monospace; font-family: PixelFont-7,monospace;
+5
View File
@@ -2,6 +2,11 @@
# yarn lockfile v1 # 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": "@babel/code-frame@^7.0.0":
version "7.12.13" version "7.12.13"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"