Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay

Browse Source

# Conflicts:
#	front/package.json
#	front/src/Components/App.svelte
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Menu/MenuScene.ts
#	front/src/WebRtc/MediaManager.ts

...

This commit is contained in:

David Négrier

2021-06-24 10:49:55 +02:00

parent 8d59680de5 52a90e52d4

commit e4708149e0

172 changed files with 15268 additions and 2850 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

front/src/Phaser/Game/GameScene.ts

+280 -229

File diff suppressed because it is too large Load Diff