Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu

Browse source
This commit is contained in:
Lurkars 2021-07-21 11:56:36 +02:00
commit 9d518eded8
13 changed files with 97 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
front/dist/resources/logos/tcm_full.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 300 B

BIN
front/dist/resources/logos/tcm_short.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 216 B

5
front/src/Components/Chat/Chat.svelte
View file

@ -30,7 +30,7 @@
<aside class="chatWindow" transition:fly="{{ x: -1000, duration: 500 }}">
<i class="close-icon" on:click={closeChat}>&times</i>
<p class="close-icon" on:click={closeChat}>&times</p>
<section class="messagesList" bind:this={listDom}>
<ul>
<li><p class="system-text">Here is your chat history: </p></li>
@ -45,13 +45,12 @@
</aside>
<style lang="scss">
i.close-icon {
p.close-icon {
position: absolute;
padding: 4px;
right: 12px;
font-size: 30px;
line-height: 25px;
font-weight: bold;
cursor: pointer;
}

1
front/src/Connexion/Room.ts
View file

@ -169,6 +169,7 @@ export class Room {
*/
public get key(): string {
const newUrl = new URL(this.roomUrl.toString());
newUrl.search = "";
newUrl.hash = "";
return newUrl.toString();
}

2
front/src/Phaser/Reconnecting/ErrorScene.ts
View file

@ -34,7 +34,7 @@ export class ErrorScene extends Phaser.Scene {
}
preload() {
this.load.image(Textures.icon, "resources/logos/tcm_full.png");
this.load.image(Textures.icon, "static/images/favicons/favicon-32x32.png");
// Note: arcade.png from the Phaser 3 examples at: https://github.com/photonstorm/phaser3-examples/tree/master/public/assets/fonts/bitmap
this.load.bitmapFont(Textures.mainFont, 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
this.load.spritesheet(

2
front/src/Phaser/Reconnecting/ReconnectingScene.ts
View file

@ -19,7 +19,7 @@ export class ReconnectingScene extends Phaser.Scene {
}
preload() {
this.load.image(ReconnectingTextures.icon, "resources/logos/tcm_full.png");
this.load.image(ReconnectingTextures.icon, "static/images/favicons/favicon-32x32.png");
// Note: arcade.png from the Phaser 3 examples at: https://github.com/photonstorm/phaser3-examples/tree/master/public/assets/fonts/bitmap
this.load.bitmapFont(ReconnectingTextures.mainFont, 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
this.load.spritesheet(