David Négrier 0c279750be Merge branch 'master' of github.com:thecodingmachine/workadventure into develop ... # Conflicts: # front/src/Phaser/Game/GameScene.ts		2021-05-11 16:43:34 +02:00
..
characters/pipoya	Adding a huge collection of characters to play with	2020-04-27 22:38:21 +02:00
customisation	added: engelbert hose + mask	2020-11-24 20:23:20 +01:00
fonts	FEAT: prototype game menu using html elements, better icon for text chat	2020-12-15 16:37:57 +01:00
html	Improvement feature circle discussion (#977)	2021-05-05 01:49:04 +02:00
items/computer	Moving maps to their own container	2020-07-23 18:43:51 +02:00
logos	Add WA logo	2021-05-11 10:13:50 +02:00
objects	Refactor Login Scene	2021-04-20 18:49:42 +02:00
style	Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2	2021-05-06 16:25:13 +02:00