lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge branch 'player-report-fix-conflict' into player-report

Browse source 
# Conflicts:
#	back/src/Controller/IoSocketController.ts
This commit is contained in:
Gregoire Parant 2020-10-13 21:16:57 +02:00
parent 05a1ea8469 9c44d37020
commit 047fa7b594
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
back/src/Controller/IoSocketController.ts
View file

@ -31,6 +31,7 @@ import {
WebRtcStartMessage,
WebRtcDisconnectMessage,
PlayGlobalMessage,
ReportPlayerMessage,
TeleportMessageMessage
} from "../Messages/generated/messages_pb";
import {UserMovesMessage} from "../Messages/generated/messages_pb";
@ -87,6 +88,8 @@ export class IoSocketController {
this.ioConnection();
}
ioConnection() {
this.app.ws('/room', {
/* Options */

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

@ -16,6 +16,7 @@ import {
ITiledMapLayerProperty, ITiledMapObject,
ITiledTileSet
} from "../Map/ITiledMap";
import {PLAYER_RESOURCES, PlayerResourceDescriptionInterface} from "../Entity/Character";
import {AddPlayerInterface} from "./AddPlayerInterface";
import {PlayerAnimationNames} from "../Player/Animation";
import {PlayerMovement} from "./PlayerMovement";