Merge branch 'develop' into action-button

Browse source

# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts

...

This commit is contained in:

Gregoire Parant 2020-11-21 15:40:24 +01:00

parent 76014e3dc1 92137dc0a3

commit 3aaeda6f80

34 changed files with 940 additions and 324 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

BIN

maps/characters/tenue_sg_1.png Normal file

View file

Binary file not shown.

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

BIN

maps/characters/tenue_sg_2.png Normal file

View file

Binary file not shown.

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