Gregoire Parant 2fcb8a76b1 Merge branch 'master' into develop ... # Conflicts: # front/src/Connexion/RoomConnection.ts # front/src/Phaser/Menu/ReportMenu.ts		2021-03-11 02:22:05 +01:00
..
AdminMessagesService.ts	Merge branch 'master' into develop	2021-03-11 02:22:05 +01:00
ConnectionManager.ts	FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call	2021-03-09 16:34:19 +01:00
ConnexionModels.ts	FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call	2021-03-09 16:34:19 +01:00
LocalUser.ts	Adding custom character textures	2020-10-20 17:42:36 +02:00
LocalUserStore.ts	FEAT: prototype game menu using html elements, better icon for text chat	2020-12-15 16:37:57 +01:00
Room.ts	Replacing FourOFourScene with more generic ErrorScene	2021-01-17 20:42:45 +01:00
RoomConnection.ts	Merge branch 'master' into develop	2021-03-11 02:22:05 +01:00