753 Commits

Author	SHA1	Message	Date
Dariusz Niemczyk	c9250c08f3	Fix CustomizeScene killing CPU ... Fixes #518	2020-12-27 10:47:56 +01:00
David Négrier	e5138e1c03	Merge pull request #505 from thecodingmachine/fixFrameLocalStorage ... Manage Local Storage customers player error	2020-12-18 16:33:36 +01:00
Gregoire Parant	a1fd209578	Fix catch error	2020-12-18 16:30:22 +01:00
David Négrier	36f886aed6	Fixing cat running too fast on reconnect scene because animations were duplicated	2020-12-18 16:08:04 +01:00
David Négrier	df114bc1ce	Fixing broken reconnection	2020-12-18 15:59:07 +01:00
Gregoire Parant	323fa6abba	Create exception error	2020-12-18 14:30:46 +01:00
Gregoire Parant	f5dd5efc0e	Manage Local Storage customers player error	2020-12-18 13:56:25 +01:00
Gregoire Parant	89064d23f9	Fix style	2020-12-18 00:09:07 +01:00
David Négrier	0984e7eaad	Fix linting	2020-12-17 22:35:38 +01:00
Gregoire Parant	ed214f2b41	Fix style menu	2020-12-17 22:10:36 +01:00
Gregoire Parant	ed8232b0f5	Fix style menu	2020-12-17 21:58:18 +01:00
Gregoire Parant	e77eb6d5be	Typo fixes	2020-12-17 18:19:47 +01:00
Gregoire Parant	ca1cd388e8	Fix lint	2020-12-17 16:39:11 +01:00
Gregoire Parant	08ce954f56	Add new click event to close co website	2020-12-17 16:36:01 +01:00
David Négrier	055131ac66	Typo fixes	2020-12-17 15:20:42 +01:00
Gregoire Parant	faf32bfa01	Fix event click listner	2020-12-17 14:16:10 +01:00
Gregoire Parant	2d4193a917	Merge branch 'develop' into notifOutSound	2020-12-17 13:56:21 +01:00
kharhamel	9fbcf0dc12	FIX: spark button open in a new window	2020-12-16 19:02:10 +01:00
Gregoire Parant	6a21436c9e	Update menu	2020-12-16 18:56:02 +01:00
Gregoire Parant	a2d56ef56a	Update admin menu	2020-12-16 18:52:11 +01:00
Gregoire Parant	1a27b7d2ee	Update menu	2020-12-16 17:17:31 +01:00
Gregoire Parant	af89965db8	Fix style button	2020-12-16 16:32:28 +01:00
Kharhamel	c93d1794b7	Merge pull request #496 from thecodingmachine/fixSkinChangeCrash ... FIX: going back a 2nd time to SelectCharacterScene used to crash the game	2020-12-16 15:25:36 +01:00
Gregoire Parant	8bf72e1ffd	Change out notification sound	2020-12-16 15:10:46 +01:00
kharhamel	eb88db92be	FIX: going back a 2nd time to SelectCharacterScene used to crash the game	2020-12-16 15:09:58 +01:00
Kharhamel	1f3c738cd0	Merge pull request #491 from thecodingmachine/updateStyleCss ... update pointer style	2020-12-16 12:58:37 +01:00
kharhamel	f5e77ad749	FIX: menu flicker	2020-12-16 12:49:34 +01:00
kharhamel	de9d6756b4	FIX: going to loginScene or customizeScene and then clicking next bring you back directly to the gameScene	2020-12-15 18:00:04 +01:00
Gregoire Parant	bb8980e1d2	update pointer style	2020-12-15 17:34:47 +01:00
Gregoire Parant	8947e1b781	update pointer style	2020-12-15 17:31:55 +01:00
kharhamel	069f2f1cec	FEAT: prototype game menu using html elements, better icon for text chat	2020-12-15 16:37:57 +01:00
David Négrier	855b55903b	Merge pull request #440 from psy/develop ... center spawn position in the middle of a tile	2020-12-11 17:36:10 +01:00
David Négrier	708790c570	Merge pull request #482 from thecodingmachine/dependabot/npm_and_yarn/front/ini-1.3.7 ... Bump ini from 1.3.5 to 1.3.7 in /front	2020-12-11 16:57:23 +01:00
kharhamel	a1aedaa594	FEAT: now play a sound when a user quit the webrtc group	2020-12-11 16:01:31 +01:00
dependabot[bot]	37fba17c20	Bump ini from 1.3.5 to 1.3.7 in /front ... Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-11 13:25:44 +00:00
David Négrier	2122014947	Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling ... # Conflicts: # front/src/Phaser/Game/GameScene.ts	2020-12-11 13:06:10 +01:00
David Négrier	6f2c319785	Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling ... # Conflicts: # back/src/Services/SocketManager.ts # deeployer.libsonnet # docker-compose.yaml # front/src/Connexion/RoomConnection.ts # front/src/Enum/EnvironmentVariable.ts # front/src/Phaser/Game/GameScene.ts # front/webpack.config.js # pusher/src/Controller/IoSocketController.ts	2020-12-11 13:00:11 +01:00
David Négrier	bf797085e6	Extracting FileController into a Uploader container	2020-12-09 21:29:29 +01:00
Kharhamel	57a59cba8e	Merge pull request #473 from thecodingmachine/master ... hotfixes from master	2020-12-03 18:48:43 +01:00
David Négrier	a19edd4dc1	Fixing reconnection to server on back failure	2020-12-03 16:39:44 +01:00
Kharhamel	95665a28d5	Merge pull request #456 from thecodingmachine/performance ... Performance settings	2020-12-03 14:33:12 +01:00
kharhamel	1971d26dc0	FIX: couldn't access to an anonymous private map	2020-12-01 19:34:36 +01:00
Kharhamel	5f372e485d	Merge pull request #468 from thecodingmachine/master ... hotfixes from master	2020-11-30 13:49:35 +01:00
kharhamel	28b0229c76	FIX: disabled pingCameraStatus and reduced the amount of errors thrown in console	2020-11-27 17:06:47 +01:00
Gregoire Parant	27634a61ee	Create menu to set your quality video and game	2020-11-27 16:24:07 +01:00
Gregoire Parant	26b81cc788	Decrease fps	2020-11-27 12:44:32 +01:00
Gregoire Parant	961e4d3f57	Decrease fps	2020-11-27 12:13:46 +01:00
David Négrier	4c1e566a6c	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Kharhamel	17e633ae45	Merge pull request #442 from cbluoss/develop ... Adding more clothing options	2020-11-26 10:30:54 +01:00
kharhamel	65785240e1	FIX: room id is now pushed to the url	2020-11-25 17:17:48 +01:00
psy	f08aec28c0	use tilewidth and tileheight to center spawn position dynamically	2020-11-25 15:58:10 +01:00
Gregoire Parant	f596f613e8	Try to decrease phaser config fps	2020-11-25 01:35:42 +01:00
Gregoire Parant	4aca04d03a	Try to decrease phaser config fps	2020-11-25 01:19:19 +01:00
Gregoire Parant	08d8222ed5	level up fps to decrease GPU use in the browser	2020-11-25 00:47:21 +01:00
yourcoke	8ff24c38b0	added: engelbert hose + mask	2020-11-24 20:23:20 +01:00
kharhamel	540f69267b	FIX: maps/dist directory is now gitignored	2020-11-24 14:43:21 +01:00
kharhamel	8d8b879ed6	FIX: the game now uses the url hash to choose the start layer	2020-11-24 14:43:21 +01:00
kharhamel	09d6d22a5d	FIX: rewrote the way scene exits are triggered	2020-11-24 14:43:21 +01:00
grégoire parant	c5af6df7fa	Merge pull request #448 from thecodingmachine/report-button ... Report button discussion	2020-11-23 20:48:52 +01:00
Gregoire Parant	3d32fb90dc	Add constant	2020-11-23 20:34:05 +01:00
Gregoire Parant	2812387650	Merge branch 'develop' into action-button	2020-11-23 20:08:19 +01:00
Gregoire Parant	26cfae7136	Merge branch 'develop' into firefox-error-jitsi ... # Conflicts: # front/src/WebRtc/MediaManager.ts	2020-11-23 15:46:19 +01:00
Gregoire Parant	fd3b8dda2c	Fix report button on anonymous connection	2020-11-22 12:40:03 +01:00
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
yourcoke	bbd3d9efae	added: hoodies	2020-11-21 15:46:04 +01:00
Gregoire Parant	f656d2edef	Update gitignore	2020-11-21 15:41:23 +01:00
Gregoire Parant	3aaeda6f80	Merge branch 'develop' into action-button ... # Conflicts: # front/dist/resources/style/style.css # front/src/Phaser/Game/GameScene.ts	2020-11-21 15:40:24 +01:00
yourcoke	f5e41cc285	added: pride shirt	2020-11-20 15:56:58 +01:00
yourcoke	62f13f6b30	added: mate bottle accessorie	2020-11-20 11:49:08 +01:00
yourcoke	a6c8132f0a	added: tinfoil hat1	2020-11-20 10:59:22 +01:00
psy	9e835620f1	center spawn position in the middle of a tile, instead of the upper left corner	2020-11-19 13:19:56 +01:00
Gregoire Parant	1bff2addf1	Merge branch 'develop' into firefox-error-jitsi ... # Conflicts: # front/src/WebRtc/MediaManager.ts	2020-11-17 18:54:51 +01:00
Gregoire Parant	11def280cb	Merge branch 'develop' into feature-discussion	2020-11-17 18:08:53 +01:00
Gregoire Parant	0a7063a478	Add close button	2020-11-17 18:03:44 +01:00
Gregoire Parant	64d00bda56	Add function to show when message received	2020-11-17 16:46:46 +01:00
Kharhamel	eed292b707	Merge pull request #428 from thecodingmachine/master ... Hotfixes from master	2020-11-17 15:26:11 +01:00
Kharhamel	ff8ebc3912	Merge pull request #425 from thecodingmachine/fix/teleportExit ... FIX: creating an exit to the current map should not cause a crash anymore	2020-11-17 15:13:04 +01:00
kharhamel	b6b76cbfaf	FIX: creating an exit to the current map should not cause a crash anymore	2020-11-17 15:02:21 +01:00
Kharhamel	f70f0a58a9	Merge pull request #424 from thecodingmachine/fix/coWebsiteBlocking ... FIX: more cowebsite fixes	2020-11-17 14:58:13 +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
David Négrier	c7031c7c54	Merge pull request #411 from thecodingmachine/fix-#314 ... Fix init position and trigger layers properties	2020-11-16 15:24:21 +01:00
Gregoire Parant	2d0fc1072f	Fix feedback	2020-11-16 15:05:51 +01:00
Gregoire Parant	0fc57f3548	Change resolution	2020-11-14 14:04:11 +01:00
Kharhamel	40e9570cdc	Merge pull request #418 from thecodingmachine/fix/coWebsiteBlocking ... FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes	2020-11-13 18:28:31 +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
Gregoire Parant	733efd4a03	Add env admin url in webpack	2020-11-13 12:41:49 +01:00
Gregoire Parant	ebfe08fb92	Create new env admin url	2020-11-13 12:15:33 +01:00
Kharhamel	6c6d046891	Merge pull request #401 from kidager/qwerty-support ... Add support for QWERTY keyboards	2020-11-12 10:32:58 +01:00
Kharhamel	b468f03603	Merge pull request #412 from thecodingmachine/fix/iHatePong ... FIX: remove the ping and pong overrides server side	2020-11-12 10:28:02 +01:00
kharhamel	9b64a970b5	FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side	2020-11-10 18:26:46 +01:00
Gregoire Parant	73fa0ecbfc	Fix init position and trigger layers properties	2020-11-10 17:00:23 +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	76014e3dc1	Merge branch 'develop' into action-button	2020-11-10 13:06:47 +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
Jacem Chaieb	c4f28a0a8d	Add support for QWERTY keyboards	2020-11-09 12:24:45 +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	a1d3b01619	Fix typo	2020-11-04 16:30:01 +01:00
Gregoire Parant	968787555f	Update feedback @moufmouf	2020-11-04 13:33:58 +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	6051e5f46a	Fix when user have activated action button	2020-11-01 11:53:24 +01:00
Gregoire Parant	fcb7f364b6	Fix button action when user have activated	2020-11-01 11:49:09 +01:00
Gregoire Parant	74de2746c2	Create action button	2020-10-31 14:04:55 +01:00
Gregoire Parant	a2dd3bd6ab	Fix style	2020-10-30 20:35:45 +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	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	f95f38b092	Permit to remove callback	2020-10-26 14:13:51 +01:00
Gregoire Parant	850be63284	Fix style	2020-10-26 00:26:10 +01:00
Gregoire Parant	1e096af43b	Fix font family	2020-10-26 00:03:30 +01:00
Gregoire Parant	bdb504722f	Fix style -webkit-focus	2020-10-25 22:41:31 +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	62dfb68aaf	Update style report modal	2020-10-15 12:24:16 +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	807ccc49d4	Fixing rewriterule with register link in prod	2020-10-14 13:52:02 +02:00
David Négrier	b7340022de	Fixing rewriterule with @ in prod	2020-10-14 13:29:16 +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