David Négrier 9f3577286d 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		2020-09-29 17:12:28 +02:00
..
Websocket	Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws	2020-09-29 17:12:28 +02:00
Distance.ts	blocked on some logic...WIP commit	2020-04-08 20:40:44 +02:00
Group.ts	Switching WebRTC to protobuf + uws	2020-09-29 16:01:22 +02:00
Movable.ts	Making groups part of zones	2020-09-16 16:06:43 +02:00
PositionInterface.ts	Switching connection to a barycenter approach	2020-04-29 22:41:48 +02:00
PositionNotifier.ts	Migrating position notification into the User class	2020-09-25 15:25:06 +02:00
User.ts	Switching WebRTC to protobuf + uws	2020-09-29 16:01:22 +02:00
World.ts	Switching WebRTC to protobuf + uws	2020-09-29 16:01:22 +02:00
Zone.ts	Migrating position notification into the User class	2020-09-25 15:25:06 +02:00