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

Browse source

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

parent 71b1327e82 c21f24e53d

commit 69e88f1513

4 changed files with 808 additions and 433 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

266

dezentrale_e1.json

View file

File diff suppressed because one or more lines are too long

719

main.json

View file

File diff suppressed because one or more lines are too long

BIN

tilesets/fantasy.png

View file

Binary file not shown.

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

BIN

tilesets/honky_objects.png Normal file

View file

Binary file not shown.

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