Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message

Browse source

+ migrating to protobuf messages

# Conflicts:
#	back/src/App.ts
#	back/src/Controller/IoSocketController.ts
#	back/yarn.lock
#	front/src/Connection.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Login/EnableCameraScene.ts
#	front/src/WebRtc/SimplePeer.ts

...

This commit is contained in:

David Négrier 2020-10-01 14:11:34 +02:00

parent 7f4014cccf e42f1a6a21

commit d3fa901691

87 changed files with 7429 additions and 1891 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

1821

back/yarn.lock

View file

File diff suppressed because it is too large Load diff