Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws

# Conflicts:
#	back/src/Controller/AdminController.ts
#	back/src/Controller/AuthenticateController.ts
#	back/src/Controller/IoSocketController.ts
#	back/src/Controller/MapController.ts
#	benchmark/index.ts
#	front/src/Connexion/RoomConnection.ts
This commit is contained in:
David Négrier 2020-09-29 17:12:28 +02:00
commit 9f3577286d
24 changed files with 342 additions and 337 deletions

View file

@ -3,6 +3,7 @@ import {URL_ROOM_STARTED} from "../Enum/EnvironmentVariable";
import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";
import {BaseController} from "./BaseController";
//todo: delete this
export class MapController extends BaseController{
constructor(private App : TemplatedApp) {