Merge branch 'takeover-fejaos-changes' into 'master'

Copied fejaos changes to our repository

See merge request dezentrale/workadventure/maps!5
This commit is contained in:
Robert Manigk 2021-12-26 15:19:14 +00:00
commit 69e88f1513
4 changed files with 808 additions and 433 deletions

File diff suppressed because one or more lines are too long

719
main.json

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 374 KiB

BIN
tilesets/honky_objects.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB