Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2
# Conflicts: # front/src/Phaser/Game/GameScene.ts # front/src/index.ts
This commit is contained in:
commit
6b4d064f19
143 changed files with 6943 additions and 1272 deletions
|
@ -33,7 +33,7 @@
|
|||
"phaser": "^3.54.0",
|
||||
"phaser3-rex-plugins": "^1.1.42",
|
||||
"queue-typescript": "^1.0.1",
|
||||
"quill": "^1.3.7",
|
||||
"quill": "1.3.6",
|
||||
"rxjs": "^6.6.3",
|
||||
"simple-peer": "^9.6.2",
|
||||
"socket.io-client": "^2.3.0",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue