David Négrier 6b970adc6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline ... # Conflicts: # front/src/Phaser/Game/GameScene.ts # front/src/Phaser/Player/Player.ts # front/src/index.ts # front/yarn.lock		2020-08-17 22:51:37 +02:00
..
characters/pipoya	Adding a huge collection of characters to play with	2020-04-27 22:38:21 +02:00
customisation	png files	2020-07-28 11:25:19 +02:00
fonts	Changed font from text	2020-05-01 23:19:51 +02:00
items/computer	Moving maps to their own container	2020-07-23 18:43:51 +02:00
logos	Add button to enter un visio	2020-04-26 20:55:20 +02:00
objects	Adding buttons to switch mode	2020-08-17 15:20:03 +02:00
style	CSS cleanup	2020-08-17 21:59:26 +02:00