Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript

Browse Source

# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
#	maps/Tuto/scriptTuto.js
#	maps/Village/Village.json

...

This commit is contained in:

DESKTOP-FMM8UI0\CLV

2021-05-21 17:45:26 +02:00

parent e655edd9bd b57a9957a3

commit 0c3b9ccfbf

189 changed files with 11326 additions and 2993 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

maps/Village/Village.json

+19 -6

File diff suppressed because one or more lines are too long