David Négrier 6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling ... # Conflicts: # back/src/Services/SocketManager.ts # deeployer.libsonnet # docker-compose.yaml # front/src/Connexion/RoomConnection.ts # front/src/Enum/EnvironmentVariable.ts # front/src/Phaser/Game/GameScene.ts # front/webpack.config.js # pusher/src/Controller/IoSocketController.ts		2020-12-11 13:00:11 +01:00
..
Controller	Cleanup of useless files	2020-12-04 17:26:12 +01:00
Enum	FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side	2020-11-10 18:26:46 +01:00
Messages	Migrating messages locally into back and front	2020-09-24 11:16:08 +02:00
Model	Reimplementing ban/unban/messages	2020-12-11 12:23:50 +01:00
Server	Fix CI	2020-10-01 15:55:23 +02:00
Services	Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling	2020-12-11 13:00:11 +01:00
App.ts	Cleanup of useless files	2020-12-04 17:26:12 +01:00
RoomManager.ts	Reimplementing ban/unban/messages	2020-12-11 12:23:50 +01:00