Commit Graph

3005 Commits

Author SHA1 Message Date
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
0c40190075 Merge branch 'develop' 2020-10-20 19:47:47 +02:00
David Négrier
c03dd4c551 Jitsi room names don't have / 2020-10-20 19:47:28 +02:00
David Négrier
1dfc51ada6
Merge pull request #350 from thecodingmachine/develop
Release 2020-10-20 2
2020-10-20 18:55:41 +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
David Négrier
479bcc2f4d
Merge pull request #347 from thecodingmachine/develop
Release 2020/10/20
2020-10-20 14:43:58 +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
fcb3972296
Merge pull request #335 from thecodingmachine/develop
Fixing change of map with relative URLs (deploy to prod)
2020-10-16 09:37:40 +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
9598487961
Merge pull request #334 from thecodingmachine/develop
Release 15/10
2020-10-15 18:15:11 +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
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
6d0c435553
Merge pull request #333 from thecodingmachine/fixstatuscode
Fixing HTTP status code not correctly outputed because of CORS headers
2020-10-15 17:35:26 +02:00
David Négrier
2bf795d9c2 Fixing HTTP status code not correctly outputed because of CORS headers 2020-10-15 17:27:40 +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
4f54c3cd86 Fixing JWT verify 2020-10-15 16:54:04 +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