noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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
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, WebRtcStartMessage,
WebRtcDisconnectMessage, WebRtcDisconnectMessage,
PlayGlobalMessage, PlayGlobalMessage,
ReportPlayerMessage,
TeleportMessageMessage TeleportMessageMessage
} from "../Messages/generated/messages_pb"; } from "../Messages/generated/messages_pb";
import {UserMovesMessage} from "../Messages/generated/messages_pb"; import {UserMovesMessage} from "../Messages/generated/messages_pb";
@ -87,6 +88,8 @@ export class IoSocketController {
this.ioConnection(); this.ioConnection();
} }
ioConnection() { ioConnection() {
this.app.ws('/room', { this.app.ws('/room', {
/* Options */ /* Options */

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

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