Merge branch 'develop' into loadTileset

# Conflicts: # CHANGELOG.md # front/src/Phaser/Game/GameScene.ts
2021-08-02 22:16:05 +02:00
parent e60c69b394 3ab069d650
commit f2d382681b
53 changed files with 1461 additions and 1898 deletions
@@ -87,6 +87,7 @@ import { SharedVariablesManager } from "./SharedVariablesManager";
 import { playersStore } from "../../Stores/PlayersStore";
 import { chatVisibilityStore } from "../../Stores/ChatStore";
 import Tileset = Phaser.Tilemaps.Tileset;
+import { userIsAdminStore } from "../../Stores/GameStore";

 export interface GameSceneInitInterface {
    initPosition: PointInterface | null;
@@ -605,6 +606,8 @@ export class GameScene extends DirtyScene {

                playersStore.connectToRoomConnection(this.connection);

+                userIsAdminStore.set(this.connection.hasTag("admin"));
+
                this.connection.onUserJoins((message: MessageUserJoined) => {
                    const userMessage: AddPlayerInterface = {
                        userId: message.userId,