Merge branch 'econocomroom2' into econocom-room

Browse source

...

This commit is contained in:

Gregoire Parant 2020-10-07 18:12:16 +02:00

parent 933a8198ba 29c908a44e

commit 11337fb742

2 changed files with 48 additions and 21 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

BIN

back/src/Assets/Maps/Floor0/econocom_panel.png Normal file

View file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

69

back/src/Assets/Maps/Floor0/floor0.json

View file

File diff suppressed because one or more lines are too long