David Négrier
8d0b78072e
Merge pull request #362 from thecodingmachine/movenospeak
...
When a user moves, do not trigger group creation
2020-10-22 16:38:26 +02:00
David Négrier
b7854dfb90
When a user moves, do not trigger group creation
...
In order to avoid triggering group creation when walking next to someone we should avoid creating a group unless the user stops next to the other members of the group.
2020-10-22 16:15:30 +02:00
David Négrier
c8434dfd4c
Renaming test file
2020-10-22 16:14:32 +02:00
Gregoire Parant
bd4b6e468e
Fix conflict
2020-10-22 02:03:58 +02:00
Gregoire Parant
7df605e771
remove useless
2020-10-22 01:58:53 +02:00
Gregoire Parant
4f8b315727
Merge branch 'develop' into usersLimit
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
2020-10-22 01:56:57 +02:00
Gregoire Parant
fd1904c246
delete canjoin function
2020-10-22 01:55:38 +02:00
grégoire parant
f002170ed5
Merge pull request #355 from thecodingmachine/user-limit-grp
...
Create and send close message
2020-10-22 01:47:53 +02:00
Gregoire Parant
ff9f5cfc32
Revert "Create and send close message"
...
This reverts commit 7ac4a2b849
.
# Conflicts:
# back/src/Controller/IoSocketController.ts
# back/src/Services/SocketManager.ts
# front/src/Phaser/Game/GameScene.ts
2020-10-22 01:46:41 +02:00
Gregoire Parant
f9bb749c56
Redirect user on wait scene
...
- Create wait scene
- Load wait scne with status close message
2020-10-22 01:33:36 +02:00
David Négrier
cb1c59c1f3
Merge pull request #360 from thecodingmachine/develop
...
Deploy 2020-10-22
2020-10-22 00:04:21 +02:00
David Négrier
b7d883b2e7
Merge pull request #359 from thecodingmachine/simple-limit-user
...
Simple limit users in room
2020-10-22 00:03:35 +02:00
Gregoire Parant
3a565362a2
Simple limit connexion in room
2020-10-21 23:45:08 +02:00
David Négrier
13a74126a2
Merge pull request #358 from thecodingmachine/develop
...
Deploy 2020-10-21 2
2020-10-21 23:39:10 +02:00
David Négrier
cad94c7982
Merge pull request #357 from thecodingmachine/fix-red-circle
...
Fix red circle created
2020-10-21 23:12:42 +02:00
Gregoire Parant
cfb6ad581e
Fix red circle created
2020-10-21 23:08:05 +02:00
David Négrier
bf135c0f23
Merge pull request #356 from thecodingmachine/develop
...
Release 2020-10-21
2020-10-21 19:54:25 +02:00
Gregoire Parant
7ac4a2b849
Create and send close message
...
# TODO
- Show error or wait room
2020-10-21 19:30:02 +02:00
arp
326c2e4183
WIP: how to respond to too many users
2020-10-21 17:43:00 +02:00
David Négrier
9d8bf8bdab
Merge pull request #354 from thecodingmachine/red-circle-full-webrtc
...
Red circle when have 4 users during webrtc meet
2020-10-21 17:34:59 +02:00
Gregoire Parant
e973921390
Fix admin tags
...
- Fix get size group
- Fix admin tags
- Fix texture already used
2020-10-21 17:22:17 +02:00
Gregoire Parant
1df4cb3e17
Red circle when have 4 users during webrtc meet
2020-10-21 16:07:42 +02:00
David Négrier
142e5c3f66
Increasing node memory to 4GB
2020-10-21 15:15:07 +02:00
David Négrier
9ec5dc093c
Improving benchmark
2020-10-21 14:55:18 +02:00
David Négrier
54fd429952
Merge pull request #351 from thecodingmachine/screan-sharing-peer-connection-fix
...
Fix sharing peer connection
2020-10-21 12:22:31 +02:00
David Négrier
7550d3ea38
Merge pull request #352 from thecodingmachine/fixloadingsametexture
...
Fixing loading of same custom texture several time
2020-10-21 12:20:22 +02:00
arp
664e699fd3
added a users limit per room
2020-10-21 11:33:57 +02:00
David Négrier
45c6e13cad
Fixing loading of same custom texture several time
...
Phaser 3 does not trigger oncomplete event if the resource is already loaded.
2020-10-21 10:34:55 +02:00
Gregoire Parant
2ee6d43274
Fix sharing peer connection
2020-10-20 20:39:33 +02:00
David Négrier
0c40190075
Merge branch 'develop'
2020-10-20 19:47:47 +02:00
David Négrier
c03dd4c551
Jitsi room names don't have /
2020-10-20 19:47:28 +02:00
David Négrier
1dfc51ada6
Merge pull request #350 from thecodingmachine/develop
...
Release 2020-10-20 2
2020-10-20 18:55:41 +02:00
David Négrier
cfed5b3053
Merge pull request #348 from thecodingmachine/screen-sharing-fix
...
Fix screen sharing
2020-10-20 18:31:31 +02:00
David Négrier
e7f1f06272
Merge pull request #349 from thecodingmachine/customtextures
...
Adding custom character textures
2020-10-20 18:30:15 +02:00
Gregoire Parant
7fa999a1bd
Fix lint
2020-10-20 18:03:10 +02:00
Gregoire Parant
173f7a5061
Fix webrct finish event delay
2020-10-20 18:02:44 +02:00
David Négrier
78a4bf3189
Adding custom character textures
2020-10-20 17:42:36 +02:00
David Négrier
a3816cd725
Merge pull request #346 from thecodingmachine/customUserStore
...
improved the local storage of the the selectcharacterScene
2020-10-20 17:38:54 +02:00
arp
dff189b223
local storage of the custom layers
2020-10-20 17:25:08 +02:00
Gregoire Parant
336742b8b3
Fix screen sharing
...
Foce screan sharing to create new peer connexion and share it
2020-10-20 14:48:59 +02:00
David Négrier
479bcc2f4d
Merge pull request #347 from thecodingmachine/develop
...
Release 2020/10/20
2020-10-20 14:43:58 +02:00
arp
f5aa70ddc2
improved the local storage of the the selectcharacterScene
2020-10-20 13:44:57 +02:00
grégoire parant
54d4a1b1f8
Merge pull request #344 from thecodingmachine/banned-message-modal
...
Banned message modal
2020-10-20 12:11:43 +02:00
Gregoire Parant
fef6786697
Fix typo
2020-10-20 11:27:11 +02:00
Gregoire Parant
3325cdf970
Update banned message modal
2020-10-20 11:25:17 +02:00
David Négrier
a4a19a60e5
Merge pull request #342 from thecodingmachine/ban-message
...
Ban feature
2020-10-20 10:26:14 +02:00
Gregoire Parant
565ce6b70b
eslint fix
2020-10-20 09:24:06 +02:00
Gregoire Parant
8d1d6fc8dc
Push message when user is connected on new room
2020-10-20 09:20:00 +02:00
Gregoire Parant
eb1f62bb1c
Add banned message and close ws
2020-10-20 08:30:11 +02:00
Gregoire Parant
7059c6e6e3
Refactor message
2020-10-20 08:20:21 +02:00