Merge branch 'master' into feature/back-players-proximity

# Conflicts: # back/src/Model/Websocket/MessageUserPosition.ts
2020-04-26 23:31:40 +02:00
parent 4bc23ede90 33bcbd4650
commit 9730df2295
47 changed files with 3083 additions and 254 deletions
@@ -104,7 +104,8 @@ export class IoSocketController{
            roomId: <string>,
            position: {
                x : <number>,
-                y : <number>
+                y : <number>,
+               direction: <string>
            }
          },
          ...
@@ -125,8 +126,7 @@ export class IoSocketController{
        }
        arrayMap.forEach((value : any) => {
            let roomId = value[0];
-            let data = value[1];
-            this.Io.in(roomId).emit('user-position', JSON.stringify(data));
+            this.Io.in(roomId).emit('user-position', JSON.stringify(arrayMap));
        });
        this.seTimeOutInProgress = setTimeout(() => {
            this.shareUsersPosition();