Gregoire Parant
|
39cdc3fbd9
|
Fix trgger stream and update scene record
|
2020-11-21 18:47:38 +01:00 |
|
Gregoire Parant
|
a6876658ab
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-21 15:57:55 +01:00 |
|
Gregoire Parant
|
11def280cb
|
Merge branch 'develop' into feature-discussion
|
2020-11-17 18:08:53 +01:00 |
|
Gregoire Parant
|
64d00bda56
|
Add function to show when message received
|
2020-11-17 16:46:46 +01:00 |
|
kharhamel
|
3d8d8cc3a9
|
FIX: more cowebsite fixes
|
2020-11-16 16:15:21 +01:00 |
|
Gregoire Parant
|
1570ef9663
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
|
2020-11-16 15:46:52 +01:00 |
|
Gregoire Parant
|
b0bd4c5f40
|
Merge remote-tracking branch 'github.com/develop' into feature-discussion
|
2020-11-16 15:43:28 +01:00 |
|
kharhamel
|
2a6b2e0cbf
|
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
|
2020-11-13 18:08:43 +01:00 |
|
David Négrier
|
ed527f5e72
|
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts
Fix/cowebsite conflicts
|
2020-11-10 15:54:27 +01:00 |
|
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 |
|
kharhamel
|
1080328afa
|
FIX: cowebsite transitions are now queued to prevent conflicts
|
2020-11-10 15:22:30 +01:00 |
|
Gregoire Parant
|
b75f28d3ca
|
Merge branch 'develop' into feature-discussion
# Conflicts:
# front/src/WebRtc/MediaManager.ts
|
2020-11-10 15:15:24 +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 |
|
Gregoire Parant
|
0acbe20bbf
|
Fix name send in message
|
2020-11-10 13:00:14 +01:00 |
|
Gregoire Parant
|
3333b3cee3
|
Fix feedback moufmouf
|
2020-11-10 12:38:32 +01:00 |
|
Gregoire Parant
|
f837f1a31f
|
Merge branch 'develop' into feature-discussion
|
2020-11-10 11:50:41 +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
|
6ef2148a34
|
Fix feedback @moufmouf
|
2020-11-04 13:07:38 +01:00 |
|
Gregoire Parant
|
47a049ecaf
|
Feedback comment @moufmouf
|
2020-11-04 12:42:33 +01:00 |
|
Gregoire Parant
|
724bb7f288
|
Merge branch 'develop' into feature-discussion
|
2020-10-30 20:04:12 +01:00 |
|
Gregoire Parant
|
df49ea856a
|
Fix conflict error
|
2020-10-27 20:51:11 +01:00 |
|
Gregoire Parant
|
80355e6b85
|
fix layout mode click when discussion is activated
|
2020-10-27 20:46:53 +01:00 |
|
Gregoire Parant
|
55c1bcee66
|
Add callback report in discussion part
|
2020-10-27 20:18:25 +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
|
65a710d1f4
|
disabling audio/video in jitsi carry over to wa
|
2020-10-26 16:55:56 +01:00 |
|
Gregoire Parant
|
f95f38b092
|
Permit to remove callback
|
2020-10-26 14:13:51 +01:00 |
|
Gregoire Parant
|
1945c24704
|
Create send data discussion
|
2020-10-25 21:59:14 +01:00 |
|
Gregoire Parant
|
f344adc48b
|
Create discussion
- Add new discussion class
- Feature to discuss and report user
|
2020-10-25 19:39:15 +01:00 |
|
Gregoire Parant
|
b6fe9e72e1
|
Fix style and refactor
|
2020-10-25 19:38:00 +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 |
|
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
|
2ee6d43274
|
Fix sharing peer connection
|
2020-10-20 20:39:33 +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 |
|
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
|
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 |
|
Gregoire Parant
|
38d2cc9a8c
|
Remove teleport feature
|
2020-10-15 12:12:11 +02:00 |
|
Gregoire Parant
|
436cde7033
|
Fixe style media manager and text modale
|
2020-10-13 21:54:08 +02:00 |
|
Gregoire Parant
|
dbaf44e814
|
Change report flag
- Add icon on video
- Permit to have a modal with comment
|
2020-10-13 19:56:42 +02:00 |
|
David Négrier
|
d3fa901691
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message
+ 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
|
2020-10-01 14:11:34 +02:00 |
|
David Négrier
|
9f3577286d
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws
# Conflicts:
# back/src/Controller/AdminController.ts
# back/src/Controller/AuthenticateController.ts
# back/src/Controller/IoSocketController.ts
# back/src/Controller/MapController.ts
# benchmark/index.ts
# front/src/Connexion/RoomConnection.ts
|
2020-09-29 17:12:28 +02:00 |
|
David Négrier
|
b485c9bf46
|
Switching WebRTC to protobuf + uws
|
2020-09-29 16:01:22 +02:00 |
|
arp
|
af4611ed29
|
rewrote the login workflow
|
2020-09-25 19:23:33 +02:00 |
|