Commit graph

925 commits

Author SHA1 Message Date
Gregoire Parant df49ea856a Fix conflict error 2020-10-27 20:51:11 +01:00
Gregoire Parant 855f42a12e Merge remote-tracking branch 'github.com/develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-10-26 22:43:14 +01:00
Gregoire Parant 997acd17ad Update to use update function scene 2020-10-26 22:39:52 +01:00
Kharhamel 11541f9f55
Merge pull request #378 from thecodingmachine/jitsiQOL
disabling audio/video in jitsi carry over to wa
2020-10-26 17:05:39 +01:00
kharhamel 65a710d1f4 disabling audio/video in jitsi carry over to wa 2020-10-26 16:55:56 +01:00
David Négrier de424769f3
Merge pull request #375 from thecodingmachine/update-admin-navbar
update admin navbar
2020-10-25 19:15:11 +01:00
Gregoire Parant 69f3e511ab Ping status camera and microphone 2020-10-24 14:40:51 +02:00
Gregoire Parant 199ed1266a Switch off camera when user is not focused on WorkAdventure windows
Feature to switch off camera when user is not focused on WorkAdventure windows after 10 seconds
2020-10-24 14:13:23 +02:00
Gregoire Parant e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
Kharhamel 3e41875cd5
Merge pull request #373 from thecodingmachine/jitsiQOL
some refractoring to jitsicreation and mediaManager
2020-10-23 17:45:54 +02:00
kharhamel 00ad28f084 feat: jitsi no start with audio or video muted when needed 2020-10-23 17:19:20 +02:00
kharhamel 3fdca94afb refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager 2020-10-23 17:19:14 +02:00
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
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 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 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
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 c03dd4c551 Jitsi room names don't have / 2020-10-20 19:47:28 +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
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
Gregoire Parant ba9f9dcbe1 Fix CD 2020-10-19 21:04:16 +02:00
Gregoire Parant dfa6d2cc66 Verify user in admin
- If 404, user don't exist in admin, it will be anonym user
- if 403, user is ban or not associate in the world
2020-10-19 20:49:30 +02:00
Gregoire Parant bf9dfcc835 Ban mesage
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
2020-10-19 19:32:47 +02:00
David Négrier 88a1e899a3
Merge pull request #338 from thecodingmachine/ioSocketRefractor
Creating a websocket for the admin plateform
2020-10-19 14:28:00 +02:00