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

Merge branch 'develop' into loadTileset

Browse source 
# Conflicts:
#	CHANGELOG.md
#	front/src/Phaser/Game/GameScene.ts
This commit is contained in:
Gregoire Parant 2021-08-02 22:16:05 +02:00
commit f2d382681b
53 changed files with 1461 additions and 1898 deletions
Download patch file Download diff file Expand all files Collapse all files

3
front/src/Phaser/Game/GameScene.ts
View file

@ -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,