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
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
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
David Négrier
a348001036
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 16:48:42 +02:00
David Négrier
702084b00a
Merge pull request #330 from thecodingmachine/exiturl
...
Adding exitUrl property
2020-10-15 16:00:50 +02:00
David Négrier
2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory
...
Fixing URL not being rewritten when changing maps
2020-10-15 15:52:01 +02:00
David Négrier
36d73333f5
Adding exitUrl property
...
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
2020-10-15 15:50:51 +02:00
David Négrier
517b3a644b
Fixing URL not being rewritten when changing maps
2020-10-15 14:35:09 +02:00
arp
67a9bd2520
improved textField component and allowed 8 caracter names
2020-10-15 14:23:39 +02:00
Gregoire Parant
38d2cc9a8c
Remove teleport feature
2020-10-15 12:12:11 +02:00
Gregoire Parant
8df56204e3
Add teleport event
2020-10-15 11:51:24 +02:00
Gregoire Parant
4799460064
Merge branch 'develop' into player-report
...
# Conflicts:
# front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
David Négrier
731ccd8796
Fix CI
2020-10-14 11:48:34 +02:00
David Négrier
98bda49d7e
Get tags from the admin
...
And uses tag "admin" to choose whether to display the console or not
2020-10-14 11:07:34 +02:00
David Négrier
ce93e5bbaa
Fixing the way rights are sent to the admin (now sending organization/world/room)
2020-10-14 10:37:00 +02:00
Gregoire Parant
436cde7033
Fixe style media manager and text modale
2020-10-13 21:54:08 +02:00
Gregoire Parant
047fa7b594
Merge branch 'player-report-fix-conflict' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
2020-10-13 21:16:57 +02:00
Gregoire Parant
9c44d37020
Merge remote-tracking branch 'github.com/develop' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
2020-10-13 21:14:46 +02:00
Gregoire Parant
05a1ea8469
Merge branch 'develop' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
2020-10-13 20:39:29 +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
cb159350e9
Fixed room switching
2020-10-13 18:44:50 +02:00
David Négrier
a2c750dea2
Fix linter
2020-10-13 17:30:53 +02:00
David Négrier
45a2721c5c
Fixing code post rebase
2020-10-13 17:20:20 +02:00
David Négrier
ec93891c6b
Using Room class to load GameScene
2020-10-13 17:10:07 +02:00
David Négrier
aee06da7f9
Refactoring Room.ts to fetch map url automatically from ID
2020-10-13 17:10:07 +02:00
arp
ccf80c1dd0
added an edge case for the default map url
2020-10-13 16:47:15 +02:00
arp
d98efc0433
lint fixes
2020-10-13 16:23:49 +02:00
Gregoire Parant
65406f844e
Teleport notification
...
- Create end point to permit the teleport notification. The map url will be /teleport/token_user
- Create message teleport
- Create receive feature in phaser to teleport
TODO
Teleport player on black room.
2020-10-13 11:39:07 +02:00
David Négrier
9a04836215
Dynamically import Quill
...
We load Quill only if it is needed (after all, only admins need Quill)
2020-10-13 10:26:27 +02:00
David Négrier
0731bd39e5
Moving back to using ScenePlugin and adding EntryScene
2020-10-12 18:59:49 +02:00
David Négrier
2852f204f5
Improving error handling upon unknown URL
2020-10-12 17:42:37 +02:00
arp
02c193a262
rewrote the authorisation flow: give more responsability to gameManager and less to gameScene
2020-10-12 16:45:09 +02:00
Gregoire Parant
aeced0c648
create message to report
2020-10-12 11:22:41 +02:00
arp
032facb75f
lint fixes
2020-10-09 17:21:46 +02:00
arp
f550c5a775
merge from develop
2020-10-09 17:10:24 +02:00
arp
c5f8b43fec
more fixes
2020-10-09 17:01:34 +02:00
Gregoire Parant
07c17452e7
Merge branch 'develop' into player-report
2020-10-09 16:15:15 +02:00
arp
5e54fc2c26
some fixes
2020-10-09 14:53:18 +02:00
arp
4af46b1b3f
simplified mapUrl parsing
2020-10-08 18:51:24 +02:00
David Négrier
386b25afa0
Switching customizeScene and gameScene to new ResizableScene
2020-10-08 16:00:29 +02:00
David Négrier
66f3345861
Adding responsive to SelectCharacterScene
2020-10-08 15:10:46 +02:00
David Négrier
79b5c5de93
Making login scene responsive
2020-10-07 18:03:34 +02:00
Gregoire Parant
c63fb6ed6f
Add image to report and to teleport player
2020-10-06 23:56:27 +02:00
David Négrier
f542b117a8
Refactoring connection to pass room info on connect
2020-10-06 18:11:42 +02:00
David Négrier
1061c80f1f
Fixing connection closing
2020-10-01 17:16:49 +02:00
David Négrier
e1193ad95a
Fixing console removal
2020-10-01 17:16:36 +02:00
David Négrier
8bc5832eac
Removing warning on startup
2020-10-01 17:15:33 +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
57262de1bf
Fixing CI + lowering extrapolation time
2020-09-30 13:49:23 +02:00
David Négrier
074398c4e0
Fixing benchmark initialization
2020-09-30 12:12:24 +02:00
David Négrier
53c6c2bc30
Fixing benchmark
2020-09-29 17:24:16 +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
432b4a0e85
Linting app
2020-09-29 16:12:17 +02:00
David Négrier
b485c9bf46
Switching WebRTC to protobuf + uws
2020-09-29 16:01:22 +02:00
David Négrier
6a4c0c8678
Migrating to uWS
2020-09-28 18:52:54 +02:00
arp
3f9659ef3c
improvments
2020-09-28 15:40:34 +02:00
arp
af4611ed29
rewrote the login workflow
2020-09-25 19:23:33 +02:00
David Négrier
ac80850335
Switching SetViewport to protobuf
2020-09-24 17:36:10 +02:00
David Négrier
24a6cd7f8e
Switched ITEM_EVENT to protobuf
2020-09-24 17:24:37 +02:00
David Négrier
cd083a2090
Merge branch 'develop' of github.com:thecodingmachine/workadventure into protobuf
...
# Conflicts:
# back/package.json
2020-09-24 16:22:16 +02:00
David Négrier
0c4c43f88c
Adding USER_LEFT message to protobuf
2020-09-24 16:11:47 +02:00
David Négrier
2dad601311
Adding JOIN_ROOM message in protobuf
2020-09-24 14:50:28 +02:00
David Négrier
d7209d8864
Migrating messages locally into back and front
2020-09-24 11:16:08 +02:00
David Négrier
b4f971c501
Switched group position to protobuf
2020-09-24 10:05:16 +02:00
Gregoire Parant
7f4014cccf
Fix CI
2020-09-23 19:07:45 +02:00
Gregoire Parant
7584c3a04d
Fix CI
2020-09-23 18:44:24 +02:00
Gregoire Parant
3cb079c80c
Fix CI
2020-09-23 18:37:54 +02:00
Gregoire Parant
d5fdb9d857
Fix style
2020-09-23 18:07:31 +02:00
Gregoire Parant
bcb126a146
Merge branch 'develop' into feature/global-message
...
# Conflicts:
# back/src/App.ts
2020-09-23 17:26:00 +02:00
Gregoire Parant
942d2cbcef
Refactor and remove prevent default keyboard
2020-09-23 17:22:00 +02:00
Gregoire Parant
8c43c67741
Create feature to send and read audio message
2020-09-21 15:00:39 +02:00
David Négrier
76d3779438
Moved GroupUpdateMessage to protobuf
2020-09-21 11:24:03 +02:00
arp
a19f09bef2
improve the register workflow
2020-09-21 10:51:48 +02:00
Gregoire Parant
16b3e48711
Add menu to switch
2020-09-21 01:16:10 +02:00
Gregoire Parant
1829912c91
Fix remove last childnode
2020-09-21 00:42:39 +02:00
Gregoire Parant
e0ae79eaf1
Fini quill box
2020-09-21 00:34:25 +02:00
Gregoire Parant
9b955ebd20
fix style quill box
2020-09-20 19:31:24 +02:00
Gregoire Parant
844bffa988
Create file controller to upload audio document
2020-09-20 19:01:21 +02:00
Gregoire Parant
45ad4bbb36
Send and play audio message
2020-09-20 17:12:27 +02:00
Gregoire Parant
4c7e458e52
create event and brodcast event in backend
2020-09-19 01:08:56 +02:00
David Négrier
b148ca3708
Linting
2020-09-18 18:16:26 +02:00
David Négrier
df0636c513
Migrating user position messages to protobuf
2020-09-18 15:51:15 +02:00
David Négrier
e9ca8721a6
Migrating userId to "int32" to save some space and adding userMoves message in protobuf
2020-09-18 13:57:38 +02:00
arp
ed9552b62b
added a register route via token
2020-09-17 18:21:49 +02:00
David Négrier
4b55b54a07
Adding first protobuf message exchange
2020-09-17 17:14:47 +02:00
Gregoire Parant
e59cbcfaa7
Create console global message
...
- Add style
- Create zone and button to show the admin console
2020-09-16 21:50:04 +02:00
Gregoire Parant
509196785b
Initialise global message
...
- Create new class to manager global message. My idea is that this class permit to manage audio or text message.
- Update html to have main content id and inject html in this.
- Create front event to receive startMessage and stopMessage.
- Delete impoted variable not used.
2020-09-16 18:38:50 +02:00
David Négrier
f5f9dcac04
Making groups part of zones
2020-09-16 16:06:43 +02:00
David Négrier
3a9196fb82
Merge
2020-09-16 11:41:03 +02:00
David Négrier
d24ec0bd75
Plugin PositionNotifier into the main application.
2020-09-15 16:21:41 +02:00
David Négrier
f8d462b0d7
Fixing "any" type
2020-09-15 10:10:35 +02:00
David Négrier
9b702c75e3
Adding batched messages + the notion of notifier / zones (not plugged in the system yet)
2020-09-15 10:06:11 +02:00
David Négrier
e418e8fd09
Setting the depth of the chat mode / presentation mode to 99999 to avoid melting buttons with map.
2020-09-10 09:31:53 +02:00
David Négrier
f70ba1411a
Hiding cam details when entering a Jisti room
2020-09-01 14:43:21 +02:00
David Négrier
9516f6615c
Centering character based on game div
...
Previously, character was centered based on window size, but when doing CoWebsite browsing, window size != game size, leading to poorly centered characters
2020-08-31 17:56:11 +02:00
David Négrier
8655aef629
Fixing URL passing in WebRtc setup
2020-08-31 15:34:21 +02:00
David Négrier
ed116cf2a3
Switching on our very own turn server
2020-08-31 15:33:50 +02:00
David Négrier
6f6873e870
Merge pull request #251 from thecodingmachine/fix_camera_stop
...
Camera was not properly closed in EnableCameraScene
2020-08-31 15:31:33 +02:00
David Négrier
634eecd42a
Fixing issue when both mic and cam are stopped
2020-08-31 15:21:05 +02:00
David Négrier
c739037bc4
Camera was not properly closed in EnableCameraScene
2020-08-31 14:54:52 +02:00
David Négrier
9351719873
Adding the notion of silent zone
2020-08-31 14:10:01 +02:00
David Négrier
df7b5cc2e3
Adding a "silent" notion (triggered in Jitsi meets)
2020-08-31 14:03:40 +02:00
David Négrier
0a8ba37049
Adding Jitsi meet support
2020-08-31 12:18:00 +02:00
David Négrier
a128ff117b
code style
2020-08-30 17:40:04 +02:00
David Négrier
01319b50ca
Adding a "openWebsite" property that opens websites when we walk over the zone.
2020-08-30 17:37:38 +02:00
David Négrier
168697eb46
Adding a GameMap class that helps tracking when the properties of the tiles the user is changes (when the user moves)
2020-08-30 15:44:22 +02:00
David Négrier
13272968cf
Clicking on a video puts it in presentation mode
...
Adding the ability to put a video in presentation mode by clicking on it.
Also, adding small CSS animations on hover.
2020-08-27 10:16:34 +02:00
David Négrier
7dc9e32b84
Merge branch 'screenshare2' into outline
2020-08-24 18:24:47 +02:00