Merge branch 'master' into webrtc

Browse source

# Conflicts:
#	front/src/Phaser/Game/GameManager.ts

...

This commit is contained in:

gparant 2020-04-28 20:50:51 +02:00

parent 881bb04eb0 cdd18fd5ac

commit 8c935e8b27

12 changed files with 682 additions and 115 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

front/dist/resources/objects/play_button.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 969 B

BIN

front/dist/resources/objects/rockSprite.png vendored

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 3.6 KiB