Commit graph

484 commits

Author SHA1 Message Date
Gregoire Parant 8412575c40 Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-10 15:27:22 +01:00
Gregoire Parant 142566dfde Fix error get media stream camera
Fix error camera when user have not cam on computer
2020-11-10 14:03:29 +01:00
Gregoire Parant 694f5d692f Merge branch 'develop' into windows-focus-blur-camera 2020-11-10 13:07:08 +01:00
kharhamel 760708948f FIX: close the coWebSite on network error 2020-11-09 11:16:54 +01:00
David Négrier 00b83ae349 Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera 2020-11-06 17:36:43 +01:00
Gregoire Parant 47a049ecaf Feedback comment @moufmouf 2020-11-04 12:42:33 +01:00
Gregoire Parant df49ea856a Fix conflict error 2020-10-27 20:51:11 +01:00
Kharhamel dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:57:56 +01:00
kharhamel 67aa2f4b6c opening and closing jitsi windows now trigger some transitions 2020-10-27 17:44:57 +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
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 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
Gregoire Parant cfb6ad581e Fix red circle created 2020-10-21 23:08:05 +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 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 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
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
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
Gregoire Parant 8d1d6fc8dc Push message when user is connected on new room 2020-10-20 09:20:00 +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 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
arp 75d9ed8dfa implemented the admin websocket
now send data
2020-10-19 14:23:50 +02:00
David Négrier bf01116f63 Removing useless features of Jitsi meet 2020-10-19 12:36:05 +02:00
David Négrier 16d1c2354e Adding fallback to unauthenticated Jitsi 2020-10-19 11:07:49 +02:00
David Négrier 260b0ea408 Adding JWT authentication to Jitsi 2020-10-16 19:23:28 +02:00
David Négrier c259dd582c Fixing change of map with relative URLs 2020-10-16 09:29:18 +02:00
David Négrier c75f1edc40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report
# Conflicts:
#	back/src/Controller/AuthenticateController.ts
2020-10-15 18:01:44 +02:00
David Négrier c59a335a1a Removing useless resource 2020-10-15 18:00:34 +02:00
David Négrier 267476c651 Removing TODO 2020-10-15 17:59:32 +02:00
David Négrier 0ea7240834 Adding condition to enable reporting only on private rooms 2020-10-15 17:58:27 +02:00
David Négrier e7890907c1
Merge pull request #331 from thecodingmachine/verifyjwtserverside
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 17:02:41 +02:00