Commit graph

912 commits

Author SHA1 Message Date
Gregoire Parant a68c661221 Fix CI 2020-10-22 11:28:34 +02:00
Gregoire Parant 367afa511b Close previous client socket if uuid client socket already exist 2020-10-22 11:26:01 +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
arp 75d9ed8dfa implemented the admin websocket
now send data
2020-10-19 14:23:50 +02:00
David Négrier 84566f08f3
Merge pull request #339 from thecodingmachine/jitsijwt
Adding JWT authentication to Jitsi
2020-10-19 13:45:26 +02:00
David Négrier bf01116f63 Removing useless features of Jitsi meet 2020-10-19 12:36:05 +02:00
David Négrier a7c16654c3 Deploying with new configurable Jitsi conf 2020-10-19 12:07:05 +02:00
David Négrier ed1fbb5324 Linting 2020-10-19 11:14:52 +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
Kharhamel 4334ab0f54
Merge pull request #332 from thecodingmachine/ioSocketRefractor
move most of the logic of IOSocketController into a dedicated class
2020-10-16 14:36:00 +02:00
David Négrier 59ae5f6b47 Fixing TCM map URL in Choose your map page 2020-10-16 10:01:20 +02:00
David Négrier c259dd582c Fixing change of map with relative URLs 2020-10-16 09:29:18 +02:00
arp e6bd655527 move most of the logic of IOSocketController into a dedicated class 2020-10-15 18:22:28 +02:00
David Négrier 1abae077a3
Merge pull request #292 from thecodingmachine/player-report
Report player
2020-10-15 18:05:48 +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