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

25

maps/Village/Village.json

View file

File diff suppressed because one or more lines are too long

BIN

maps/Village/logo-WA.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

0

maps/Village/sol_intérieur.png → maps/Village/sol_interieur.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

maps/Village/sol_intérieur.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 20 KiB

BIN

maps/Village/su1 Student male 12.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

maps/Village/su3 Student fmale 02.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

maps/Village/tileset1-repositioning.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB