1570 Commits

Author	SHA1	Message	Date
GRL	b18b2fe0e3	preparation for merge with metadataScriptApi	2021-05-25 09:50:59 +02:00
GRL	a3165a0540	pause for loading tileset on the fly	2021-05-25 09:39:04 +02:00
GRL	d0aaa0620d	Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi	2021-05-25 09:24:26 +02:00
DESKTOP-FMM8UI0\CLV	0c3b9ccfbf	Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript ... # Conflicts: # front/src/Api/IframeListener.ts # front/src/Phaser/Game/GameScene.ts # front/src/iframe_api.ts # maps/Tuto/scriptTuto.js # maps/Village/Village.json	2021-05-21 17:45:26 +02:00
GRL	1110f4fb7f	Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" ... This reverts commit 796a9418d3, reversing changes made to 3506063e65.	2021-05-21 16:24:48 +02:00
GRL	796a9418d3	Merge branch 'update-game-tiles' into metadataScriptingApi	2021-05-21 15:56:35 +02:00
GRL	3506063e65	first step on loading a tileset from a script	2021-05-20 17:09:10 +02:00
GRL	2f9cc393a7	Implementation of getTag of the current user ... documentation of getTag Adding map for test of getTag	2021-05-20 10:57:36 +02:00
kharhamel	d93b30f982	improved radial menu	2021-05-19 18:11:51 +02:00
kharhamel	35b37a6a88	Added a radial menu to run emotes	2021-05-19 15:17:50 +02:00
kharhamel	a1d52b4265	FEATURE: added the possibility toplay emotes	2021-05-19 15:17:03 +02:00
GRL	ce0a72c6ce	Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi	2021-05-19 09:36:11 +02:00
GRL	b509471140	documentation ... documentation of onPlayerMove documentation of getMap documentation of getGameState	2021-05-18 17:05:16 +02:00
GRL	aa78bf44ef	implementation of DataLayerEvent ... update GetGameState to add nickname to the returned data update GameMap to separate phaserLayer and mapLayer	2021-05-18 15:41:16 +02:00
GRL	201fcf6afa	Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi	2021-05-18 15:18:35 +02:00
GRL	2ee62c9e9e	Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi	2021-05-18 11:50:03 +02:00
kharhamel	20ec609535	FIX: rejected map axios promises are now catched	2021-05-18 11:45:07 +02:00
GRL	3edfd5b285	GameState is now save in cache ... HasPlayerMoved is send when the player is actually moving on the map every 200ms.	2021-05-18 11:33:16 +02:00
David Négrier	2ea731beeb	Merge pull request #1057 from thecodingmachine/physics_flag ... Making sure Physics is not enabled several times	2021-05-18 10:26:32 +02:00
David Négrier	c9eb5691b5	Merge pull request #1045 from thecodingmachine/svelte ... Installing Svelte in front container	2021-05-18 10:25:54 +02:00
David Négrier	127a4759ac	Merge branch 'develop' of github.com:thecodingmachine/workadventure into menu-command-api ... # Conflicts: # front/src/Api/Events/IframeEvent.ts # front/src/Api/IframeListener.ts # front/src/iframe_api.ts	2021-05-18 10:16:44 +02:00
David Négrier	9b68faac0e	Fixing JSDoc	2021-05-18 09:53:54 +02:00
David Négrier	6128f1e431	Making sure Physics is not enabled several times ... As part of an energy saving measure, we started disabling physics when the character is not moving and enabling physics again only when the character moves. However, we enabled Physics on each frame the characeter was moving. As a result, the Physics system would run several times, slowly slowing the computer down. This fixes this issue by adding a flag to only enable Physics once.	2021-05-18 09:42:01 +02:00
David Négrier	24dfa2703d	Set a global dirty flag on resize ... This adds a global "Dirty" flag at the Game level and sets it each time the ScaleManager is modified. This fixes a bug where the game was not redrawn when a CoWebsite was opening/closing.	2021-05-18 09:20:38 +02:00
David Négrier	54e9e5656b	Commenting menu display (for now)	2021-05-17 16:50:35 +02:00
David Négrier	7cc1e5b2c6	Moving styles out of the "dist/" directory	2021-05-17 16:41:40 +02:00
David Négrier	5cb58d98a0	Adding correct SCSS file integration with Svelte	2021-05-17 16:41:09 +02:00
David Négrier	1885ea42a4	First working example with Svelte (the menu icon shows up on entering the game)	2021-05-17 16:39:56 +02:00
David Négrier	62cc1f73ca	Tryig to fix webpack for Svelte	2021-05-17 16:39:56 +02:00
David Négrier	9bc79c3ed3	Adding Svelte to the project	2021-05-17 16:39:55 +02:00
kharhamel	a66d42e158	FEATURE: we now allow a global zoom level of 1.5	2021-05-17 16:11:38 +02:00
kharhamel	a23e72454d	FEATURE: added the env variable DISABLE_DIRTY_CHECKS	2021-05-17 14:47:34 +02:00
David Négrier	fe573893a1	Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues ... Setting "importsNotUsedAsValues": "error"	2021-05-13 19:43:34 +02:00
GRL	43aad4ab14	phaserLayers managed by Gamemap ... Implementation of LayersFlattener Implementation of Setting properties of a layer form script Update show/hide layer form script Update unit test of LayersIteratorTest	2021-05-12 14:30:12 +02:00
David Négrier	f57c01dee8	Refactoring Webpack files to remove prod file. The prod file is now inferred from the NODE_ENV variable.	2021-05-12 11:28:21 +02:00
David Négrier	8c1e01566a	Upgrading all dependencies in front ... Upgrading to Webpack 5, Typescript 4, ...	2021-05-12 10:35:14 +02:00
David Négrier	4d4f845b9e	Setting "importsNotUsedAsValues": "error" ... Turning the "importsNotUsedAsValues" TS config value to "error". This will require us to use `import type` instead of `import` when we are importing a value that is only used as a type (and therefore that is dropped by the Typescript compiler). Why this change? This is a requirement to be able to use Svelte in the future. See https://github.com/sveltejs/svelte-preprocess/issues/206#issuecomment-663193798	2021-05-12 09:13:25 +02:00
TabascoEye	2d8997c6d7	turning noise suppresion back on ... turning AGC off was a good idea, disabling noise suppresion with it was not. => should all end up in the "settings" menu in the end	2021-05-11 18:14:42 +02:00
TabascoEye	627db30410	turning noise suppresion back on ... turning AGC off was a good idea, disabling noise suppresion with it was not. => should all end up in the "settings" menu in the end	2021-05-11 17:38:28 +02:00
David Négrier	d2b122efe5	Merge pull request #1035 from thecodingmachine/improveDirtyScene ... FIX: trackDirtyAnims now listen to more generic events	2021-05-11 17:08:29 +02:00
kharhamel	4ec5ad9e33	FIX: trackDirtyAnims now listen to more generic events	2021-05-11 16:44:31 +02:00
David Négrier	0c279750be	Merge branch 'master' of github.com:thecodingmachine/workadventure into develop ... # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-05-11 16:43:34 +02:00
David Négrier	ad39b43df3	Closing game webcame in Jitsi ... When stepping in Jitsi, the game webcam (from mediaManager) was not shut down. And when enabling/disabling the webcam in Jitsi, the webcam in mediaManager was also enabled/disabled. This PR fixes those issues. It also fixes a race condition when closing a Jitsi where the mic/cam would be enabled at the same time.	2021-05-11 14:52:51 +02:00
Kharhamel	78d4985d10	Merge pull request #1028 from thecodingmachine/fixOnMapExit ... FIX: triggering a map transition now ignores other map transitions for 500ms	2021-05-11 14:21:06 +02:00
kharhamel	f044b3d249	FIX: triggering a map transition now ignores other map transitions for 500ms	2021-05-11 11:05:05 +02:00
David Négrier	23bf78a026	Refactoring code to use the "visibilitychange" event ... Using the "visiblitychange" event instead of relying on a "trick" related to RAF being disabled when a window is not open allows us to have cleaner code. Bonus: the recursive call to "setTimeout" is gone, so the stacktrace growing indefinitely is gone too. This should make the application a bit more stable.	2021-05-11 10:56:50 +02:00
Gregoire Parant	52b1c6733b	Notification & Camera ... - Notification when user is first and not focus on the tab - Camera focus when user is in discussion circle and back on tab with previous config camera settings - Camera stay blur if user is in discussion circle and not back on the tab # Conflicts: # front/src/WebRtc/MediaManager.ts	2021-05-11 10:13:38 +02:00
jonny	8cef4f6e90	Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read ... # Conflicts: # front/src/Api/IframeListener.ts	2021-05-10 21:48:11 +02:00
jonny	2c4c98b0e5	limited event trigger to max 10 per second	2021-05-10 21:44:15 +02:00
jonny	8e136cebe8	added callback on playermove - gets quite delayed after walking for a few seconds	2021-05-10 21:27:17 +02:00
grégoire parant	0fd743bcac	HotFix sound meter (#1029)	2021-05-10 20:49:17 +02:00
grégoire parant	bd4cf5d7f7	Fix error context sound meter (#1009)	2021-05-10 19:55:43 +02:00
David Négrier	0411d5e493	Fixing "camera popup" always display on resize ... This fixes a bug where the "camera popup" window was always displayed when the screen was resized.	2021-05-10 19:05:01 +02:00
GRL	fd931c4884	Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi	2021-05-10 14:45:41 +02:00
David Négrier	c025d1798b	Renaming restorePlayerControls/disablePlayerControls ... Putting "controls" in the plural form: - restorePlayerControl => restorePlayerControls - disablePlayerControl => disablePlayerControls	2021-05-10 12:18:06 +02:00
GRL	cd2d090a8b	Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi	2021-05-10 11:46:16 +02:00
GRL	841bf29764	auto update show/hide layer	2021-05-10 11:20:07 +02:00
GRL	a6ba8d41b9	implement show/hide layer with scripting	2021-05-10 11:19:18 +02:00
jonny	ce0c7ea3eb	Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read	2021-05-10 10:01:53 +02:00
jonny	a5260c0831	Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api	2021-05-10 09:58:59 +02:00
jonny	4758820aa4	Merge remote-tracking branch 'remotes/workadventure-main/develop' into menu-command-api	2021-05-10 09:54:39 +02:00
jonny	46996f7049	moved event trigger out of index array	2021-05-10 01:34:33 +02:00
jonny	8db72d2dfd	refactored to Array of tile	2021-05-10 01:34:32 +02:00
jonny	bed45a8310	cherry pick conflicts	2021-05-10 00:31:54 +02:00
jonny	ffe03d40f5	option to update tile ... # Conflicts: # front/src/Api/Events/ApiUpdateTileEvent.ts # front/src/Api/IframeListener.ts # front/src/Phaser/Game/GameScene.ts	2021-05-10 00:30:32 +02:00
jonny	91148035ec	polyfill generic message event	2021-05-09 21:46:40 +02:00
jonny	cf06f29ef8	fixed cherry pick conflicts	2021-05-09 21:38:11 +02:00
jonny	8da5bf9f8e	typed iframe api events ... # Conflicts: # front/src/Api/IframeListener.ts # front/src/iframe_api.ts	2021-05-09 21:36:48 +02:00
jonnytest1	2922ae4603	Merge branch 'develop' into menu-command-api	2021-05-07 19:59:58 +02:00
DESKTOP-FMM8UI0\CLV	e655edd9bd	export class Popup and Soud of Iframe Api ... let become const in SoundManager	2021-05-07 17:03:07 +02:00
David Négrier	5605e63e5f	Merge pull request #998 from thecodingmachine/skiprender2 ... Skip "render" if nothing changed on screen (2)	2021-05-07 15:44:08 +02:00
Gregoire Parant	62a6eabc88	Merge branch 'master' into develop	2021-05-07 00:07:43 +02:00
grégoire parant	0e32238505	HotFix custom WOKA (#999)	2021-05-06 19:58:08 +02:00
David Négrier	6b4d064f19	Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2 ... # Conflicts: # front/src/Phaser/Game/GameScene.ts # front/src/index.ts	2021-05-06 16:25:13 +02:00
David Négrier	189dba2e21	Fixing memory leak when switching scenes	2021-05-06 15:38:24 +02:00
David Négrier	3b5f105daf	Setting the dirty state automatically when there is an animation frame	2021-05-06 15:38:22 +02:00
David Négrier	6d3cbc573c	Instruct systems with 2 GPUs to use the low power GPU (to save battery)	2021-05-06 15:36:49 +02:00
David Négrier	0c5e5ef578	Skip "render" if nothing changed on screen ... For each requested animation frame (RAF) in Phaser, Phaser calls the "update" method, then the "render" method of each scenes. The "render" method takes some time (and energy) to perform the rendering. The fact is we probably don't need to call "render" if nothing changed on the screen (which happens most of the frames in a typical WorkAdventure game). This commit is therefore overloading the "Game" class of Phaser to add a "dirty" flag. Scenes can now add a "isDirty()" method. If all displayed scenes are pristine (not dirty), Phaser will skip rendering the frame altogether. This saves "a lot" of energy, resulting in laptops that are not overheating when using WorkAdventure \o/	2021-05-06 15:36:45 +02:00
David Négrier	271300aa8d	Merge pull request #982 from jonnytest1/baseUrlFix ... fixed url cannot be relative	2021-05-06 15:09:13 +02:00
jonny	a24ca078e6	use iframe url if no script ... # Conflicts: # front/src/Api/IframeListener.ts	2021-05-05 19:15:32 +02:00
David Négrier	fea1de36a4	Merge pull request #974 from tabascoeye/patch-1 ... allow numbers in nickname again	2021-05-05 18:44:01 +02:00
David Négrier	3751b0e2bc	Removing RESOLUTION and ZOOM_LEVEL settings: they are no more needed or supported	2021-05-05 17:11:03 +02:00
David Négrier	7ae66a63a4	Refactoring centering of DOM elements	2021-05-05 17:10:39 +02:00
David Négrier	04448c3c50	Fixing button position in webcam setting page	2021-05-05 15:46:02 +02:00
David Négrier	cd2873e9d3	Fixing CI	2021-05-05 13:14:00 +02:00
David Négrier	bede7abdd8	Removing mousewheel to up down plugin	2021-05-05 12:15:13 +02:00
David Négrier	10bd073b7d	Fixing center computation of popup	2021-05-05 12:12:56 +02:00
David Négrier	82073098e0	Merge branch 'develop' of github.com:thecodingmachine/workadventure into resolution	2021-05-05 11:01:11 +02:00
David Négrier	a6ad1674e3	Fixing broken resize	2021-05-05 09:51:04 +02:00
David Négrier	f66e69cb75	Improving pinch (virtual joystick stops when pinch begins)	2021-05-05 09:35:24 +02:00
grégoire parant	71eb3f3b69	Improvement feature circle discussion (#977) ... * Improvment circle discussion - Change to lissen start event of WebRTC connection * Update help allow navigator and waring message - Show warning message. - Use help camera allow setting to show modal and help user. - Change feature to show the modal only when user have need the information on allow navigator access * Create soud for video discussion	2021-05-05 01:49:04 +02:00
Gregoire Parant	83159a121f	Revert logo loading and fix it	2021-05-04 15:47:45 +02:00
Gregoire Parant	c8692a08ce	Revert "Fix loader logo WA (#991)" ... This reverts commit fa3ffe4d7a.	2021-05-04 15:15:23 +02:00
grégoire parant	fa3ffe4d7a	Fix loader logo WA (#991)	2021-05-04 14:28:30 +02:00
David Négrier	59b391e983	Prevent WA scale manager from zooming too much	2021-05-04 14:08:40 +02:00
David Négrier	613ff5d463	Adding zoom out limit	2021-05-04 12:09:00 +02:00
David Négrier	04d3cf8593	Adding HdpiManager to start and scale from a default resolution that is correct by default for the game. ... Fixing VirtualJoystick on resize.	2021-05-04 11:35:33 +02:00
jonnytest1	5069099000	fixed typing in chat still causes character to move (#965)	2021-05-03 20:26:42 +02:00
jonnytest1	0a5dffd034	Update ScriptUtils.ts	2021-05-03 16:11:16 +02:00
jonny	cd77af318d	added more properties ... # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-05-01 19:45:23 +02:00
jonny	d674ac9e0c	fixed url cannot be relative	2021-05-01 17:43:31 +02:00
TabascoEye	2b2c60cbe3	allow numbers in nickname again ... closes #972	2021-04-30 10:51:23 +02:00
grégoire parant	925545d74f	Add error message (#970) ... - Error link not found - Error user was banned - Error access dinied on the world	2021-04-29 23:47:30 +02:00
jonny	99bd9d88d9	renamed api method "exitSceneTo"	2021-04-29 10:56:56 +02:00
jonny	8f1aea1c43	Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api	2021-04-29 10:49:14 +02:00
kharhamel	fe27169745	solved conflict with develop	2021-04-29 10:31:16 +02:00
grégoire parant	5c0b5ef74b	HotFix release v1.3.1 (#958) ... - Update camera style support mobile - Fix admin console error	2021-04-29 01:26:09 +02:00
grégoire parant	9b69910cb8	WIP: Update style for mobile (#942) ... * Update style for mobile - Update style for mobile modale * Fix overscroll * Change css properties overflow * Revert "Change css properties overflow" This reverts commit 612fcc7e007fb03c7f72e5fa4b8a0604a184ae7d. * rm image * Update view mobile * Fix CI	2021-04-27 23:58:33 +02:00
jonny	6295c8275e	reset menu items on map change	2021-04-27 16:40:56 +02:00
jonny	4069e87872	replace menu items if already present	2021-04-27 12:40:29 +02:00
jonny	fafaabb6e7	script api can add menu commands ... # Conflicts: # front/src/Api/IframeListener.ts # front/src/iframe_api.ts	2021-04-27 12:07:02 +02:00
jonny	79e530f0e6	launch jsons + type fixes	2021-04-27 00:04:08 +02:00
jonny	6e847b5f58	Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop	2021-04-27 00:02:05 +02:00
David Négrier	08ca95b143	Fixing WorkWrap	2021-04-26 11:28:15 +02:00
David Négrier	22cb41dc29	Adding the ability to display "Text" objects from Tiled ... I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles. However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be able to display some text easily on a map. This PR adds the ability to display this text. Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local system, and those fonts are not available in a browser.	2021-04-26 11:28:13 +02:00
David Négrier	6815fe7a0a	Added a new LayersIterator class ... This class iterates recursively over layers, flattening groups. This enables us to simplify the code when we iterate layers. We can remove all recursive function calls in the GameScene code (it is delegated to the LayersIterator)	2021-04-26 11:21:34 +02:00
Lurkars	66b90be0da	remove redundancy	2021-04-26 11:20:28 +02:00
Lurkars	93b7b7bc91	removed redundancy, fix for startLayer	2021-04-26 11:20:28 +02:00
Lurkars	9b6be3466b	support for group layer of Tiled (excludes 'start' layer)	2021-04-26 11:20:28 +02:00
grégoire parant	d9620c373f	Merge pull request #918 from thecodingmachine/newStartMobileScene ... Mobile started scene	2021-04-23 19:51:45 +02:00
Gregoire Parant	b934d3404f	Fix feedback WorkAdventure team	2021-04-23 19:29:43 +02:00
DESKTOP-FMM8UI0\CLV	b79d76fc2e	parameter soundConfig is now optionnal ... if user call mySound.play() the sound will be played with the base SoundConfig	2021-04-23 17:03:17 +02:00
DESKTOP-FMM8UI0\CLV	f03f8076f3	Sound in Script Done ... Fom script user can load, play and stop sound	2021-04-23 15:35:34 +02:00
David Négrier	4f4f499d47	Making alone mode more robust ... This fixes a number of issues where the game was attempting to access a non existing connection (in alone mode)	2021-04-23 13:44:04 +02:00
Gregoire Parant	f11e936143	Refactoring & fix feedback WorkAdventure	2021-04-23 03:59:14 +02:00
Gregoire Parant	8e52b8597c	Merge branch 'develop' into newStartMobileScene ... # Conflicts: # front/src/Phaser/Login/EnableCameraScene.ts # front/src/Phaser/Login/LoginScene.ts # front/src/Phaser/Login/SelectCharacterScene.ts # front/src/Phaser/Login/SelectCompanionScene.ts	2021-04-22 23:36:21 +02:00
Gregoire Parant	d7f00b505a	Update Companion Scene for mobile	2021-04-22 13:10:23 +02:00
Gregoire Parant	3697ddabfa	Fix responsive Camera Settings	2021-04-22 11:47:59 +02:00
Gregoire Parant	3df32de83b	Update camera and adapte for mobile	2021-04-22 11:26:35 +02:00
Gregoire Parant	0a04f5d631	Finish select character scene and custom character scene	2021-04-22 02:29:13 +02:00
kharhamel	c8ba3d8ab9	FIX: use phaser Zones instead of rectangles objects to create tap zones	2021-04-21 18:27:33 +02:00
kharhamel	6a2326c4b3	WIP: testing new resolution config	2021-04-21 18:04:00 +02:00
DESKTOP-FMM8UI0\CLV	517c0e86cb	Can play Sound from a map script ... add sound in the TutoMap	2021-04-21 16:47:19 +02:00
jonny	3836d5037c	game state can be read out by the client APIs ... # Conflicts: # front/src/Api/IframeListener.ts # front/src/Phaser/Game/GameScene.ts # front/src/iframe_api.ts	2021-04-21 15:56:52 +02:00
jonny	006195e8cc	rewrote to run in event loop	2021-04-21 11:54:37 +02:00
jonny	6c6789411a	added loadPage Api call	2021-04-21 11:20:17 +02:00
David Négrier	f9f6abe7b3	Switching setTimeout to false	2021-04-21 10:37:20 +02:00
David Négrier	84bd5eff50	Bump Phaser version ... This reverts commit f2c3d6f158. Also, updates all dependencies to their latest allowed version. # Conflicts: # front/package.json # front/yarn.lock	2021-04-21 10:35:38 +02:00
Gregoire Parant	78d888ffaf	Update menu mobile ... - Add mobile style share modal - Add mobile style settings modal - Add menu mobile style	2021-04-21 00:53:45 +02:00
Gregoire Parant	2c862fe7e7	Refactor Login Scene	2021-04-20 18:49:42 +02:00
Kharhamel	5dc2f0ac47	Merge pull request #898 from thecodingmachine/touchZoom ... FEATURE: add the ability to zoom in and out using touch screen	2021-04-20 14:51:08 +02:00
kharhamel	341b048d6c	improved the visuals of the joystick	2021-04-20 14:26:52 +02:00
kharhamel	415d8f9466	the joystick is now visible only when pointer is down	2021-04-20 10:52:06 +02:00
Gregoire Parant	5e8951fdaa	Merge branch 'master' into develop	2021-04-19 21:19:35 +02:00
Gregoire Parant	e7b5bb261d	HotFix performance ... - Change forceSetTimeOut to false and permit to freeze the scene. - Fix style sending audio message - Fix banned message from admin console	2021-04-19 20:19:40 +02:00
kharhamel	56287a2958	put the virtual joystick into the userInputManager and restricted it to touchscreens	2021-04-19 18:10:33 +02:00
David Négrier	06f6b3153c	Merge pull request #913 from ClementVieilly75/FTUEPopup ... Ftue popup	2021-04-19 16:24:02 +02:00
DESKTOP-FMM8UI0\CLV	7e6a8b477d	Debug state of share Screen button	2021-04-19 15:16:56 +02:00
David Négrier	cb1dcb5786	Merge pull request #908 from ClementVieilly75/FTUEPopup ... Unsubscribe to iframeEvents in CleanUpClosingScene	2021-04-19 11:24:43 +02:00
DESKTOP-FMM8UI0\CLV	5028a54422	Unsubscribe to iframeEvents in CleanUpClosingScene	2021-04-19 10:19:30 +02:00
David Négrier	110511461a	Fixing WorkWrap	2021-04-17 18:55:39 +02:00
David Négrier	16daf7332a	Adding the ability to display "Text" objects from Tiled ... I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles. However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be able to display some text easily on a map. This PR adds the ability to display this text. Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local system, and those fonts are not available in a browser.	2021-04-17 12:05:54 +02:00
Kharhamel	afd2ea2d03	Merge pull request #897 from thecodingmachine/maxPerGroup ... FEATURE: added the env variable MAX_PER_GROUP	2021-04-16 17:19:01 +02:00
kharhamel	d7a74baa9d	FEATURE: add the ability to zoom in and out using touch screen	2021-04-15 16:37:58 +02:00
kharhamel	ce2c5e0cb5	FEATURE: added the env variable MAX_PER_GROUP	2021-04-15 15:50:51 +02:00
Gregoire Parant	a42e873f64	Merge branch 'master' into develop	2021-04-14 20:11:41 +02:00
David Négrier	1a4f178728	Update front/src/Phaser/Menu/MenuScene.ts	2021-04-14 15:57:57 +02:00
Kharhamel	3874b2bc2b	Merge pull request #688 from tabascoeye/patch-2 ... disable automatic gain control on microphone	2021-04-13 18:20:56 +02:00
Kharhamel	faade46400	Merge pull request #894 from thecodingmachine/topVerticalMode ... FIX: in vertical mode, the coWebSite now open from the top	2021-04-13 15:16:06 +02:00
Kharhamel	4bbfd4f12f	Merge pull request #893 from workadventure-xce/fix/first_login ... Fix first login with empty local storage	2021-04-13 15:15:32 +02:00
Gregoire Parant	ba8d3020eb	Merge branch 'master' into HotFixForm	2021-04-13 12:33:04 +02:00
Gregoire Parant	4119f69879	HotFix ... - Key up m when user write message - Size game share	2021-04-13 12:30:15 +02:00
kharhamel	f82551016a	FIX: in vertical mode, the coWebSite now open from the top	2021-04-13 11:34:14 +02:00
PizZaKatZe	633bdfcaff	Always enable virtual joystick ... Keeps 'toggle fullscreen' as a separate game setting.	2021-04-13 02:00:06 +02:00
PizZaKatZe	340caaff32	Make virtual joystick transparent	2021-04-13 02:00:05 +02:00
PizZaKatZe	9c9d262782	Make movement speed depend on joystick force	2021-04-13 02:00:05 +02:00
PizZaKatZe	e713120434	Reposition joystick (thx @TabascoEye)	2021-04-13 02:00:04 +02:00
PizZaKatZe	c3230bc2b3	Integrate virtual joystick	2021-04-13 02:00:03 +02:00
PizZaKatZe	e75fb9a6a9	Add touch support to companion selection scene	2021-04-13 02:00:02 +02:00
PizZaKatZe	5462af0dc7	Fix first login with empty local storage ... During first login on a new domain the local storage is empty. This led to a TypeError and hence blank black screen.	2021-04-13 01:58:32 +02:00
PizZaKatZe	edd4e9e95d	Add touch support for Jitsi and website triggers	2021-04-13 00:23:40 +02:00
¯\_(ツ)_/¯	aab65298aa	Add touch support to character customization screen	2021-04-13 00:23:40 +02:00
PizZaKatZe	e807350279	Add touch input support to login scenes (thx @TabscoEye)	2021-04-13 00:23:37 +02:00
PizZaKatZe	c7dcaec940	Make login text input field touch capable (thx @TabscoEye)	2021-04-13 00:19:06 +02:00
Gregoire Parant	270cdb5c82	Button "CREATE MAP" must redirect user on production server	2021-04-12 20:44:29 +02:00
Gregoire Parant	6a08ca656f	Add TODO	2021-04-12 18:26:36 +02:00
Gregoire Parant	4fc9a12b95	HotFix style WorkAdventure	2021-04-12 18:17:04 +02:00
Kharhamel	8cdf572685	Merge pull request #870 from joberthel/feature/player-companion ... Added companion (pet) to player	2021-04-12 18:11:07 +02:00
Kharhamel	29d43d7776	Merge pull request #878 from thecodingmachine/localStorageGhost ... FIX: improved the validation from localstorage for username and characterLayers	2021-04-12 14:56:51 +02:00
kharhamel	8e467f3e10	FIX: improved the validation from localstorage for username and characterLayers	2021-04-12 14:48:00 +02:00
David Négrier	3dd2a634a0	Allowing loading HTTP local resources from a HTTPS endpoint. ... By default, maps are loaded in HTTPS if WorkAdventure is running in HTTPS, and in HTTP is WorkAdventure is running in HTTP. Also, if WorkAdventure is running in HTTP and map loading fails, we try map loading in HTTPS (useful when we are working on WorkAdventure locally and want to load a map on a secure domain). This commit adds the last combination: If WorkAdventure is running in HTTPS, and map loading fails in HTTPS **AND** if the map URL is targetting "localhost", "*.localhost" or "127.0.0.1", then we attempt to load the resource in HTTP. Why? "localhost" is considered secure context by modern browsers. So even if a page is loaded in HTTPS, it can load resources from any secure context (including localhost in HTTP). This means that from "https://play.workadventu.re", I can now test a map running locally on my machine (served by a classic webserver without any certificate). This change should make map testing easier, since map developers will not have to install the whole WorkAdventure project to test their map locally.	2021-04-11 14:56:03 +02:00
Johannes Berthel	8d4e0c3e88	added companion compatibility with phaser 3.54.0	2021-04-09 18:30:30 +02:00
David Négrier	d80681c40b	Merge branch 'develop' into FTUEPopup	2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV	2c84d9a07d	position of popups changed ... clear log in gameScene	2021-04-09 16:34:01 +02:00
DESKTOP-FMM8UI0\CLV	46cc7b3b3b	add pannels	2021-04-09 14:35:15 +02:00
Johannes Berthel	32784d6775	Merge branch 'develop' into feature/player-companion	2021-04-08 23:37:36 +02:00
Johannes Berthel	73e515c236	don't show companion scene after first refresh	2021-04-08 18:42:05 +02:00
Johannes Berthel	2438470088	fixed rectangle resize issue	2021-04-06 20:31:08 +02:00
Johannes Berthel	fb90111cdf	refactored companion selection scene	2021-04-06 20:12:10 +02:00
Johannes Berthel	187e21eed9	load texture inside game scene instead inside of inside companion class	2021-04-06 19:10:18 +02:00
Johannes Berthel	e5a196a42b	implemented feedback	2021-04-06 18:54:45 +02:00
Johannes Berthel	7c6b73efdb	don't show companion selection during first connexion flow	2021-04-06 18:36:46 +02:00
grégoire parant	575c1a9f23	Merge pull request #861 from joberthel/fix/use-selected-video-quality ... Use selected video quality during webcam initialization	2021-04-06 15:08:03 +02:00
Johannes Berthel	6c512fb7cd	fixed linting	2021-04-03 00:18:08 +02:00
Johannes Berthel	8c35860f2a	show select companion scene after customize scene	2021-04-02 23:49:25 +02:00
Johannes Berthel	4aa082d83b	Merge branch 'develop' into feature/player-companion	2021-04-02 23:40:30 +02:00
Johannes Berthel	3187520e7b	companion behaviour fine tuning	2021-04-02 23:36:06 +02:00
Johannes Berthel	38c06ce8ff	navigate from select character scene to select companion scene	2021-04-02 23:17:04 +02:00
Johannes Berthel	6ee4889773	added change companion button to menu	2021-04-02 23:13:03 +02:00
Johannes Berthel	52303c0bd6	added select companion scene	2021-04-02 23:00:51 +02:00
Johannes Berthel	4cfce15695	only remove listener if scene was not already destroyed	2021-04-02 21:29:45 +02:00
Johannes Berthel	e4d324e5fa	removed unused import	2021-04-02 21:26:42 +02:00
Johannes Berthel	fc3a503bcf	don't fail if companion texture is not found	2021-04-02 21:26:24 +02:00
Johannes Berthel	c07079051a	transmit companion to remote players	2021-04-02 21:21:11 +02:00
Johannes Berthel	2ad712807b	add companion only on local player	2021-04-02 17:14:34 +02:00
kharhamel	88cc15cd02	FEATURE: editing a room in the admin trigger a refresh system	2021-04-02 15:22:02 +02:00
Johannes Berthel	5a91e15580	add companion to remote player	2021-04-01 18:51:51 +02:00
Johannes Berthel	80a5d2e30e	added random companion to player	2021-04-01 00:33:05 +02:00
David Négrier	adf2e60d54	Fixing issue with double slash in websocket URL	2021-03-31 17:50:27 +02:00
David Négrier	e166c69b58	Fixing reading of the relative URL in RommConnection	2021-03-31 16:38:51 +02:00
David Négrier	3ef1f0dc7b	[Breaking change] UPLOADER_URL and ADMIN_URL are now true URLs (and not only host name) and API_URL is replaced by PUSHER_URL ... API_URL is still accepted for BC compatibility of the self-hosted deployments. This will allow deploying on a single domain, using a reverse proxy that acts on the path. This however means that the config needs to be changed for all WorkAdventure deployments.	2021-03-31 16:00:14 +02:00
David Négrier	cd7a332b4c	Improving error throwing and handling in pusher/admin/front	2021-03-31 15:49:01 +02:00
Johannes Berthel	441416f312	use frame rate setting for initialization	2021-03-30 22:38:44 +02:00
David Négrier	dd0d1fa49f	Merge pull request #854 from thecodingmachine/loadhttpsmapsfromhttp ... Allow loading https maps from http protocol	2021-03-30 17:57:38 +02:00
David Négrier	a68cf38cdc	Merge pull request #856 from thecodingmachine/alonemode ... Adding an "alone" mode	2021-03-30 17:56:19 +02:00
David Négrier	02fb42b68a	Merge pull request #790 from thecodingmachine/iframe_api ... Adding an API for inter-iframe communication	2021-03-30 16:31:30 +02:00
David Négrier	559e15ebb6	Adding an "alone" mode ... In "alone" mode (or single-player mode), WorkAdventure does not connect to the server at all. In order to enter the "alone" mode, you need to add "?alone=true" to the URL. "alone" mode can be useful for tutorials (First Time User Experience) where you want to explain how WorkAdventure works without being disturbed by other users.	2021-03-30 16:08:49 +02:00
David Négrier	b6edefbe4e	Allow loading https maps from http protocol ... In a development environment, we often run in HTTP. The problem is that WorkAdventure will attempt to load maps using the HTTP protocol (even if the map is on a remote server that is available only in HTTPS). This commit adds a "fallback". If we are in HTTP (so in a development environment) and if the map fails to load correctly, we will try again, but in HTTPS. This allows development environment to load maps hosted on a HTTPS enabled server easily.	2021-03-28 18:35:01 +02:00
David Négrier	ee53d8f0b8	Hiding iframe in prod	2021-03-28 17:21:10 +02:00
David Négrier	8b90a14c39	Fix import	2021-03-28 17:07:00 +02:00
David Négrier	aaaa192b71	Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api ... # Conflicts: # front/dist/.gitignore # front/dist/index.tmpl.html # front/src/Phaser/Game/GameScene.ts # front/src/WebRtc/CoWebsiteManager.ts	2021-03-28 16:53:15 +02:00
David Négrier	98aa94bb12	Minor changes	2021-03-28 16:36:02 +02:00
Johannes Berthel	5375528d7c	use map tilewidth instead of hardcoded values	2021-03-27 13:57:50 +01:00
kharhamel	886daebfea	improved the unloading process to not create a useless socket	2021-03-26 14:19:37 +01:00
DESKTOP-FMM8UI0\CLV	8764fe5de5	Popup openWebSite ... Add possibility to open a website with a popup 3 cases : Open page GoTo Page OpenCoWebsite	2021-03-25 17:12:53 +01:00
kharhamel	99e6743c01	FIX: resizing on wide screen on chrome now use the correct coordinates	2021-03-25 14:35:51 +01:00
Kharhamel	dc1a5da175	Merge pull request #837 from thecodingmachine/fixCameraHelpPopup ... FIX: help camera settings popup now only show up once	2021-03-24 16:05:21 +01:00
kharhamel	0b352fc5dc	FIX: help camera settings popup now only show up once	2021-03-24 15:59:18 +01:00
kharhamel	43921e3fcc	FIX: fixed a bug with fullscreen mode	2021-03-24 15:51:18 +01:00
Kharhamel	ec2fa9501c	Merge pull request #813 from thecodingmachine/warningMessage ... Warning message	2021-03-24 14:27:13 +01:00
kharhamel	8d6c1a50bf	FEATURE: warning message when world is near full capacity	2021-03-23 17:44:47 +01:00
DESKTOP-FMM8UI0\CLV	e05c25a857	replace let for const for variables non reassigned	2021-03-23 17:15:22 +01:00
Kharhamel	7765775df5	Merge pull request #825 from workadventure-xce/audio_player_improvements ... Audio player improvements	2021-03-23 14:07:20 +01:00
PizZaKatZe	599fdd6ceb	Fix group icons and audio attenuation	2021-03-22 20:09:11 +01:00
TabascoEye	e6accd711d	Store muted setting of audio player in local storage ... This commit was originally authored by @TabascoEye, then rebased and improved by @pizkaz: * refactors local user storage, adding audio player settings * stores "muted" state of audio player in local store	2021-03-22 20:09:11 +01:00
PizZaKatZe	5bd6f49846	Fix (now legacy) 'playAudioLoop' property	2021-03-22 20:09:11 +01:00
PizZaKatZe	fdbcd98a9a	Implement audio volume and loop properties	2021-03-22 20:09:11 +01:00
PizZaKatZe	132c6c9ad6	Fix volume auto-reduction in conversations	2021-03-22 20:09:09 +01:00
PizZaKatZe	5a7e67f5df	Reflect volume change in audio control	2021-03-22 20:06:55 +01:00
David Négrier	f9a2097bc9	Merge pull request #828 from thecodingmachine/develop ... Deploy 2021-03-22	2021-03-22 16:42:28 +01:00
Kharhamel	04bd60ca26	Merge pull request #827 from workadventure-xce/fix/jitsi_integration ... Fix Jitsi integration	2021-03-22 16:27:32 +01:00
DESKTOP-FMM8UI0\CLV	3ef3561b57	no message	2021-03-22 16:10:21 +01:00
PizZaKatZe	318c63ab90	Fix Jitsi integration ... Jitsi iframes are rendered directly in the cowebsite div next to the cowebsite > main element. This patch fixes the situation.	2021-03-22 11:36:14 +01:00
PizZaKatZe	13fcda7bcf	Remove scroll bars	2021-03-21 12:55:14 +01:00
GRL	e50c8bc354	Suppression of *{...} in every HTML files because the style.ccs file already declare it. ... Suppression unused code	2021-03-19 16:21:35 +01:00
GRL	1cfb22f695	Creation of the HelpCameraSettingsScene ... Update of GameManager and index to include the new scene Change title of helpCameraSettings Suppression function reset	2021-03-19 15:40:07 +01:00
GRL	0b00055eda	Use includes instead of indexOf	2021-03-19 14:40:18 +01:00
GRL	c654f722e3	Add Firefox image ... Check permissions in the game Button Continue to continue without allowing camera and microphone	2021-03-19 12:04:37 +01:00
Gregoire Parant	d68406d5e1	Create input need page	2021-03-19 12:02:42 +01:00
kharhamel	32fdfaab35	edited CoWebsiteManager to manage vertical resizing	2021-03-18 16:11:22 +01:00
kharhamel	0701e607fa	added sass loader to the project and put the cowebsite style in its own sass file	2021-03-18 12:37:05 +01:00
kharhamel	f9c8b4131c	added fullscreen	2021-03-17 18:57:00 +01:00
kharhamel	272be3eba0	improve the visual of the cowebsite	2021-03-17 18:35:19 +01:00
kharhamel	3f6c61633a	FEATURE: complete control over the iframe size	2021-03-17 18:34:12 +01:00
David Négrier	ffb5823b2a	Adding the ability to specify a custom Jitsi URL directly in the map ... This feature allows to add a "jitsiUrl" property in the map. As a result, you can use for a given Jitsi room a custom instance of Jitsi. Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided) The Jitsi external_api.js script is now lazily loaded.	2021-03-16 20:37:12 +01:00
DESKTOP-FMM8UI0\CLV	662134498c	Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup ... # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-03-12 17:06:42 +01:00
David Négrier	086b88b09a	Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api	2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV	c5c8770a60	Add First Version of Tuto ... PopUp Player Control disable Fake bubble displayed	2021-03-12 16:39:29 +01:00
kharhamel	fe8c75610d	FIX: player anims correctly stop on the idle frame	2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV	fa4d917729	Resolve conflit with GameScene.ts	2021-03-11 16:03:39 +01:00
DESKTOP-FMM8UI0\CLV	6441fa71d3	Adding placeHolder Popup tuto to Map2 ... need to cut player controller and simulate bobble	2021-03-11 10:58:48 +01:00
Gregoire Parant	2fcb8a76b1	Merge branch 'master' into develop ... # Conflicts: # front/src/Connexion/RoomConnection.ts # front/src/Phaser/Menu/ReportMenu.ts	2021-03-11 02:22:05 +01:00
Gregoire Parant	2cf99df2da	Hot Fix report	2021-03-11 02:03:06 +01:00
Gregoire Parant	46cb9333e6	HotFix message in back	2021-03-11 01:25:36 +01:00
DESKTOP-FMM8UI0\CLV	f9f618094d	adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js	2021-03-10 17:22:39 +01:00
DESKTOP-FMM8UI0\CLV	8d0411e8a3	can manage position and width/height of a popUp using a square in Tiled	2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV	5e4940dba6	Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup ... * 'iframe_api' of https://github.com/thecodingmachine/workadventure: Removing closeOnClick as it is not implemented Adding a Popup object with a close() method on it.	2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV	f7f8be24bc	Set Position of the popUp with pos of an object in floorLayer object group	2021-03-10 08:57:49 +01:00
David Négrier	7fddcc28f1	Removing closeOnClick as it is not implemented	2021-03-09 18:57:25 +01:00
David Négrier	bb8b222c22	Adding a Popup object with a close() method on it.	2021-03-09 18:51:30 +01:00
David Négrier	18464e4942	Adding button clicked handling	2021-03-09 18:05:07 +01:00
Kharhamel	21cc842c33	Merge pull request #793 from thecodingmachine/adminWorldsLimit ... FEATURE: the connexion error an user can get when a world is full is now correctly treated.	2021-03-09 17:45:43 +01:00
DESKTOP-FMM8UI0\CLV	4545de8af1	Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup ... * 'iframe_api' of https://github.com/thecodingmachine/workadventure: Adding button clicked handling # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-03-09 17:12:28 +01:00
DESKTOP-FMM8UI0\CLV	d29e0819f4	Get position of an object in Tile to set popUp Position	2021-03-09 17:07:14 +01:00
kharhamel	8abc34c631	FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call	2021-03-09 16:34:19 +01:00
David Négrier	1e002f93ed	Implementation of openPopup script method (WIP)	2021-03-09 16:21:14 +01:00
David Négrier	ed2ce68f37	Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api ... # Conflicts: # front/dist/.gitignore # front/src/Phaser/Game/GameScene.ts	2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV	b175b7164d	Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup ... * 'develop' of https://github.com/thecodingmachine/workadventure: Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority. Trying to enable back connection on admin from develop, knowing that the develop certificate is broken Revert "Adding back admin in develop branch CI" Adding back admin in develop branch CI Fixing GA tag not included in play domain FEATURE: better implementation of the admin global message Fix ci Update private access Allow URLs relative to map base in iframe / openWebsite # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV	afac042706	supp debug log	2021-03-09 13:53:46 +01:00
David Négrier	2bef328d8a	Adding the abaility to track users entering/leaving a zone in the script language.	2021-03-08 18:58:38 +01:00
DESKTOP-FMM8UI0\CLV	858bf0b384	Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property ... Adding map "Tuto2", the FTUE map	2021-03-08 09:28:15 +01:00
David Négrier	6fbf165c91	Adding the ability to register a single script using the "script" attribute at the map property level.	2021-03-07 21:02:38 +01:00
David Négrier	7d67f55012	Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages.	2021-03-06 16:00:07 +01:00
David Négrier	e927e0fa16	Adding ability to listen to user types chat messages using WA.onChatMessage	2021-03-06 15:26:07 +01:00
David Négrier	5178dff108	Adding strong checks on messages exchanged using generic-type-guard	2021-03-05 16:50:54 +01:00
David Négrier	83fa23a82d	Fixing eslint	2021-03-05 11:47:04 +01:00
David Négrier	eb93a04341	Adding an API for inter-iframe communication ... Adds a first version of an API to communicate between an iFrame opened by WorkAdventure and WorkAdventure itself. The first API method is a method allowing to add messages in the chat, from the iFrame. Comes with a test file.	2021-03-04 19:00:00 +01:00
David Négrier	bf8e8bf777	Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url ... Allow URLs relative to map base in iframe / openWebsite	2021-03-04 18:21:48 +01:00
kharhamel	ad7e16c33b	FEATURE: better implementation of the admin global message	2021-03-04 16:18:06 +01:00
David Négrier	e0540790e1	Translating button	2021-03-01 14:36:18 +01:00
Lukas Bachschwell	2772d72eba	Fix report userId in report menu ... Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>	2021-02-24 21:32:16 +01:00
David Négrier	6e9c715980	Merge pull request #739 from t10r/fix/multi-user-videochat-mode ... fix multi user videochat mode	2021-02-19 14:54:38 +01:00
David Négrier	6f06b92395	Merge pull request #760 from thecodingmachine/turncredentials ... Fixing screensharing Coturn credentials	2021-02-18 14:09:33 +01:00
David Négrier	13a20a0ef0	Fixing screensharing Coturn credentials ... When screensharing is initiated by the user, we previously did not send the correct Coturn credentials. We now send the last credentials received from the Video stream.	2021-02-18 11:52:30 +01:00
grégoire parant	b5514e6e48	Merge pull request #759 from thecodingmachine/jitsiConfig ... Fix last properties changed after trigger change position	2021-02-18 11:37:41 +01:00
Gregoire Parant	772c3174be	Fix last properties changed after trigger change position	2021-02-18 11:32:37 +01:00
grégoire parant	3a1b2490ef	Merge pull request #758 from thecodingmachine/jitsiConfig ... Jitsi config	2021-02-18 10:12:16 +01:00
Gregoire Parant	8a2954eab9	Fix new conf feature	2021-02-18 09:38:27 +01:00
grégoire parant	13078489c6	Merge pull request #757 from thecodingmachine/jitsiConfig ... Merge Jitsi config	2021-02-17 20:34:31 +01:00
Gregoire Parant	5ddf909fe6	Remove unless export constante	2021-02-17 20:26:33 +01:00
Gregoire Parant	fff0cbc3f6	Revert message exit	2021-02-17 19:40:00 +01:00
Gregoire Parant	9b7b3eb140	Update feedback @tabascoeye	2021-02-17 19:31:05 +01:00
Gregoire Parant	ce423c9fec	Remove exit trigger action	2021-02-17 19:29:59 +01:00
Gregoire Parant	83fc7d0cc0	Merge branch 'develop' into exitTriggerAction ... # Conflicts: # front/src/Phaser/Game/GameScene.ts	2021-02-17 19:28:41 +01:00
Gregoire Parant	baae1e8125	Update to restore previous config	2021-02-17 19:21:37 +01:00
Gregoire Parant	e8b1b286a3	Merge Jitsi config	2021-02-17 18:49:55 +01:00
David Négrier	ae1d00c828	Merge pull request #736 from MisterErwin/patch-1 ... Fix offsets of SpeechBubble.ts	2021-02-16 20:02:03 +01:00
David Négrier	43b48ce555	Merge pull request #737 from MisterErwin/patch-2 ... Do not change rooms if scene failed to load	2021-02-16 20:01:00 +01:00
David Négrier	ddcb5ede59	Merge pull request #742 from znerol-forks/fix/huge-jitsi-url ... Fix jitsi URLs growing indefinitely in length	2021-02-16 19:52:56 +01:00
David Négrier	9affa36608	Merge pull request #746 from thecodingmachine/turncredentials ... [Feature] Connect to a Coturn server using REST API	2021-02-16 19:32:21 +01:00
kharhamel	e21868ed3b	FIX: current audio and video status are overwriten by jitsi config	2021-02-16 18:25:23 +01:00
David Négrier	6b00355ea8	Fixing WebRtc user name / password when using TURN REST API	2021-02-16 18:13:30 +01:00
David Négrier	12ef2820bf	Refactoring parameters passed to ScreenSharingPeer	2021-02-16 11:08:03 +01:00
David Négrier	cdb3cfdc81	[Feature] Connect to a Coturn server using REST API ... This allows connecting to a TURN server with temporary passwords. The passwords are expiring after 4 hours.	2021-02-16 11:06:05 +01:00
znerol	9670f92a08	Allow URLs relative to map base in iframe / openWebsite	2021-02-16 10:53:50 +01:00
znerol	4fcdad1551	Fix jitsi URLs growing indefinitely in length	2021-02-15 10:36:56 +01:00
Tim Schlüter	05b829da70	fix multi user videochat mode	2021-02-13 21:19:45 +01:00
MisterErwin	aff4c8d145	Do not change rooms if scene failed to load ... Sometimes a following room fails to load (e.g., #582) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).	2021-02-13 14:15:09 +01:00
MisterErwin	511cd99e22	Fix offsets of SpeechBubble.ts ... Since some recent optimizations, they are being added on top of the player, which makes the offset redundant.	2021-02-13 14:04:28 +01:00
kharhamel	0c892e0243	FEATURE: implemented a client side blacklist	2021-02-12 19:15:24 +01:00
Gregoire Parant	b92b7304b0	Fix to use clear All Keys	2021-02-11 21:48:24 +01:00
David Négrier	64cd07cc39	Merge pull request #726 from thecodingmachine/fixHtmlAnchorElement ... Update to use Anchor type	2021-02-11 18:08:52 +01:00
David Négrier	bc35ade8df	Improving urlify	2021-02-11 18:03:14 +01:00
David Négrier	c8fc8a2834	Merge pull request #699 from thecodingmachine/pixelartmode ... Switching Phaser to pixelart mode	2021-02-11 17:20:20 +01:00
David Négrier	42aee9f5c8	Merge pull request #722 from thecodingmachine/jitsislugify ... Slugifies the Jitsi room name	2021-02-11 17:17:58 +01:00
David Négrier	35fdd3bf29	Merge pull request #717 from kalkspace/add-stun-server-env-variable-with-fallback ... Add STUN_SERVER env variable with fallback	2021-02-11 17:17:36 +01:00
Gregoire Parant	c5916e7b6d	Fix ci	2021-02-11 15:06:12 +01:00
Gregoire Parant	0d104cb307	Update to use Anchor html	2021-02-11 14:49:32 +01:00
David Négrier	91fddd6893	Slugifies the Jitsi room name ... This will avoid Jitsi breaking on unexpected characters and displaying a HTTP 404 error.	2021-02-10 13:51:17 +01:00
David Négrier	f6e93da48a	Fixing loading logo being displayed when nothing was loaded	2021-02-10 12:08:16 +01:00
David Négrier	8389fad877	Disabling video background by default on Jitsi ... (because it consumes a lot of CPU)	2021-02-10 11:20:05 +01:00
David Négrier	e7ddeedb3e	Disabling Join/Leave notifications by default	2021-02-10 11:13:47 +01:00
David Négrier	a5bdf68246	Moving property reading inside startJitsi (startJitsi is called at 2 different places)	2021-02-10 11:08:57 +01:00
Mickael Chimansky	5cb9624b0b	fixup! Jitsi config properties	2021-02-09 20:31:49 +01:00
Mickael Chimansky	9c4d0aa32f	Jitsi config properties	2021-02-09 16:05:21 +01:00
Sebastian Wiesendahl	b6807d274b	Add STUN_SERVER env variable with fallback ... default: "stun:stun.l.google.com:19302" Make STUN_SERVER available for app config Change also the STUN_SERVER for ScreenSharingPeer	2021-02-09 13:09:17 +01:00
David Négrier	969c9fd544	Fixing loading logo being displayed when nothing was loaded	2021-02-09 12:41:35 +01:00
David Négrier	adb535d1b6	Merge pull request #703 from thecodingmachine/socialNetworkLink ... Social network link anonymous connexion	2021-02-04 16:10:25 +01:00
Gregoire Parant	03f1f5bf75	Update feedback @moufmouf	2021-02-04 16:05:05 +01:00
Gregoire Parant	59b4b168e9	Social network link anonymous connexion ... In menu, add social newtork link when user is connected in anonymous mode	2021-02-03 23:14:31 +01:00
Gregoire Parant	4de9b8ba40	Fix icon discussion ... - Fix size of discussion icon - Update x and y when page is resize - Fix blanc link in chat	2021-02-03 23:11:33 +01:00
grégoire parant	c41c058fb0	Merge pull request #527 from oliverlorenz/feature/iframe-feature-policy ... feat: adds property openWebsitePolicy property to set "allow" property in iframe	2021-02-03 17:38:35 +01:00
David Négrier	9c9f046b16	Merge pull request #668 from piitaya/fix_game_not_centered ... Use canvas instead of div container for calculating the game size	2021-02-03 14:06:09 +01:00
grégoire parant	f2b9f6c92a	Merge pull request #686 from thecodingmachine/publicReportedUser ... Permit puiblic report	2021-02-02 18:09:25 +01:00
David Négrier	3f274df813	Redesigning loading bar	2021-02-02 17:17:00 +01:00
David Négrier	e757d63924	Switching Phaser to pixelart mode ... To be honest, I'm not sure what it does exactly (it is supposed to prevent antialiasing and it is rounding coordinates for rendering sprites, but I don't see a difference yet.	2021-02-02 12:04:50 +01:00
Gregoire Parant	788e22e8b0	Fix loading logo of WorkAdventure	2021-02-01 16:52:28 +01:00
Gregoire Parant	f99db4856f	Add WorkAdventure logo	2021-01-30 20:33:31 +01:00
Gregoire Parant	ac2bc76239	change style report button	2021-01-30 14:08:11 +01:00
TabascoEye	58b7d85bf3	bugfix and linting ... * use 'const' on constraints which never change * also re-enable constraints ater mic was re-enabled (after mute/unmute)	2021-01-30 02:24:36 +01:00
TabascoEye	31a0d08c76	disable automatic gain control on microphone ... AGC really makes the soundqulity way worse than it could be. Especially since it is so noticeable when entering a Jitsi where AGC is disabled (and suddenly some people sound much better). In the long run, this should probably be configurable. On the other hand the setting changes the audio _going out_ from a user, so it might be hard for him to judge which settings are a good or a bad idea…	2021-01-30 02:13:03 +01:00
Gregoire Parant	7eb38fae83	Permit puiblic report ... - Create report html - Add report flag	2021-01-29 21:09:10 +01:00
David Négrier	2f01677849	Merge pull request #681 from thecodingmachine/downgradephaser3.24 ... Downgraded phaser version to 3.24.1	2021-01-28 23:08:47 +01:00
kharhamel	f2c3d6f158	downgraded phaser version to 3.24.1	2021-01-28 23:03:06 +01:00
David Négrier	ce56a5cba1	Revert "downgraded phaser version to 3.22"	2021-01-28 22:38:20 +01:00
Paul Bottein	a8b5e8599f	use HTMLCanvasElement	2021-01-28 21:09:41 +01:00
Paul Bottein	608a9ad347	use type guard	2021-01-28 21:07:17 +01:00
Paul Bottein	b52c546a8c	Use canvas instead of div container for calculating the game size	2021-01-28 21:04:43 +01:00
kharhamel	e7120317c1	downgraded phaser version to 3.22	2021-01-28 19:15:34 +01:00
David Négrier	b7b2934106	Merge pull request #672 from Amirault/tam_use_type_guard_on_html_element ... Use type guard for html element subtype	2021-01-28 17:13:02 +01:00
Tony Amirault	72799d4f0e	added end of line	2021-01-28 15:31:09 +01:00
Kharhamel	9849e70613	Merge pull request #670 from thecodingmachine/httpCypress ... Removed cypress from the project	2021-01-28 15:03:12 +01:00
kharhamel	ca231eee4a	remove cypress from the project :(	2021-01-28 14:56:24 +01:00
Tony Amirault	cdbae5fa43	use type guard on html element	2021-01-27 18:33:40 +01:00
David Négrier	8eebed1829	Removing pipeline related code ... This code is broken since Phaser 3.50 and we are facing weird issues with MacOS memory leaks and crashes. Removing this code will remove one potential suspect.	2021-01-27 11:18:07 +01:00
grégoire parant	86f1099247	Merge pull request #648 from thecodingmachine/customCharacterLadyLoading ... Fix custom character lazy loading	2021-01-26 15:27:46 +01:00
Gregoire Parant	45b355f780	Refactor lazy loading	2021-01-26 15:21:23 +01:00
Kharhamel	556d5a4695	Merge pull request #658 from thecodingmachine/lockUserBanned ... Lock user banned	2021-01-26 14:06:35 +01:00
Gregoire Parant	1dd2858424	Fix feadback @Kharhamel	2021-01-26 14:04:42 +01:00
Gregoire Parant	e2695c58af	Verify existing texture	2021-01-26 09:16:39 +01:00
Gregoire Parant	803be36def	Merge branch 'develop' into customCharacterLadyLoading	2021-01-26 09:02:17 +01:00
Gregoire Parant	c6903cc4c5	Use Error scene and add banned message	2021-01-26 08:57:10 +01:00
David Négrier	a4cb39eef3	Merge pull request #653 from thecodingmachine/maccrash ... Add a parameter to allow changing phaser renderer	2021-01-25 16:52:15 +01:00
Gregoire Parant	8de05c39c1	Lock user when he was banned	2021-01-25 14:10:16 +01:00
Gregoire Parant	beb53df364	Error problem open new map	2021-01-25 13:18:57 +01:00
Gregoire Parant	5f88a1a0b9	Exit trigger action ... - [x] Add trigger message custom - [x] Add trigger for exit map - [x] Update documentation	2021-01-25 12:21:40 +01:00
David Négrier	c2c8680dae	Fix linting	2021-01-25 12:02:00 +01:00
David Négrier	8609cda0d0	Add a parameter to allow changing phaser renderer ... Recently, some Macs have been crashing running WorkAdventure. Hard to say if this is related to Phaser 3.50 upgrade or to the new MacOS version. It happens mostly on Mac Air and might be related to WebGL rendering. This commit allows to switch to CANVAS renderer by adding `?phaserMode=canvas` in the URL	2021-01-25 11:18:48 +01:00
Kharhamel	18fb508828	Merge pull request #639 from thecodingmachine/betterLink ... changed the color of the chat links and unit test	2021-01-25 10:42:32 +01:00
Kharhamel	39194b5531	Merge pull request #642 from tabascoeye/patch-1 ... cleanup when closing the scene	2021-01-25 10:35:01 +01:00
Kharhamel	d32fca9777	Merge pull request #597 from psy/feature_streams ... add remote files and streams to playAudio	2021-01-25 10:33:43 +01:00
Gregoire Parant	232ac6d5d1	Error lazy loading ... Update loader custom characters	2021-01-24 18:00:30 +01:00
Gregoire Parant	75d8d46c62	clean	2021-01-24 16:02:10 +01:00
Gregoire Parant	d93a8da828	Fix custom character lazy loading	2021-01-24 15:57:47 +01:00
TabascoEye	39b433eef5	Update GameScene.ts ... stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene Fixes #633	2021-01-23 01:16:13 +01:00
kharhamel	4ad7f4d5a3	changed the color of the chat links and unit test	2021-01-22 15:06:41 +01:00
David Négrier	3d84a9c8cd	Turning French 'Moi' into English 'Me'	2021-01-21 10:16:08 +01:00
David Négrier	bbf9325396	Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths	2021-01-21 09:40:11 +01:00
Thomas Basler	14b328c733	Removed hard coded default map ... You can apply local maps using the maps vhost as previously. But it's also possible to specify external maps by prepending http or https.	2021-01-20 22:56:21 +01:00
David Négrier	aa9a21ad4c	Merge pull request #581 from Informatic/fix/firefox-webcam ... front: fix webrtc webcam feed on Firefox	2021-01-20 16:27:45 +01:00
David Négrier	b03abee481	Fixing admin links	2021-01-20 10:34:34 +01:00
Gregoire Parant	c95419f0e7	Prepar release 1.1.0 ... Automatically redirect on floor0 of TCM map	2021-01-18 22:52:25 +01:00
David Négrier	c466ba8ca5	Merge pull request #601 from thecodingmachine/featureBan ... Create ban feature by admin console	2021-01-18 19:31:51 +01:00
David Négrier	65d2c3dfb0	Disabling explicit any check on error handling	2021-01-18 15:36:02 +01:00
Gregoire Parant	679dbd4215	Fix focus cam on select cam scene	2021-01-18 10:40:13 +01:00
David Négrier	4234b38910	Better error message in case of 404	2021-01-17 22:40:54 +01:00
David Négrier	adca51f6de	Replacing FourOFourScene with more generic ErrorScene	2021-01-17 20:42:45 +01:00
kharhamel	fd29826556	fixed a crash linked to incorrect textureDescriptors	2021-01-14 14:47:02 +01:00
psy	8d67947bc1	move map url to else case	2021-01-14 11:48:06 +01:00
psy	f431e769cc	add remote files and streams to playAudio	2021-01-14 11:45:14 +01:00
David Négrier	8cf481ec49	Fixing bug when no WebGL is available ... The switch to Phaser 3.50 introduced a bug when WebGL is not available in a browser. The changes in this commit prevent calls to the WebGL pipeline if the pipeline is not available.	2021-01-13 18:39:28 +01:00
grégoire parant	8ffba3157a	Merge pull request #588 from thecodingmachine/customiseCharacters ... Customise characters with admin console	2021-01-13 16:47:13 +01:00
Gregoire Parant	512be7acd2	New basic characters	2021-01-13 16:46:24 +01:00
Gregoire Parant	993c58cf8e	Fix select rectangle for customize scene	2021-01-12 19:49:48 +01:00
Gregoire Parant	987c80c9c4	Fix menu	2021-01-12 19:48:48 +01:00
grégoire parant	0f7f42b6f1	Merge pull request #566 from thecodingmachine/screanSharing ... Fix screen sharing	2021-01-12 19:24:06 +01:00
Gregoire Parant	123ee4bc43	Fix responsive and limite select cursor	2021-01-12 15:29:26 +01:00
Gregoire Parant	f8d4b696e8	Customise characters with admin console ... - Add new characters choise - Display on 3 line of 6 pers - Add custom characters from admin console wilth level -1	2021-01-12 13:19:51 +01:00
grégoire parant	648e6aef97	Merge pull request #561 from thecodingmachine/linkNotClickable ... Verify URL in message	2021-01-12 11:30:11 +01:00
Piotr Dobrowolski	7f8cc76eb7	front: fix webrtc webcam feed on Firefox ... Seems like Firefox doesn't support specifing both exact and ideal constraints...	2021-01-10 17:05:48 +01:00
kharhamel	472fbb1de0	All player textures are now lazy-loaded	2021-01-08 11:44:41 +01:00
Piotr Dobrowolski	af260ad229	front: add AnimatedTiles plugin	2021-01-07 18:37:57 +01:00
Kharhamel	c2d0cda441	Merge pull request #572 from thecodingmachine/master ... Master	2021-01-07 14:00:45 +01:00
Gregoire Parant	e8f1b2d048	Add clear array peer connection sharing	2021-01-07 12:58:45 +01:00
kharhamel	3ce8427378	fixed a game crashed because of lack of animations and improved the character class	2021-01-07 12:46:13 +01:00
Gregoire Parant	a88ad3cf4d	Dont delete PeerSharingConnection because it will be resuse ... When user try to screen charing with same user, the event send is not a offer but renegociation. So could clear arry only when user out of circle.	2021-01-07 12:13:12 +01:00
Gregoire Parant	018f01e878	Increase stability camera and microphone permission	2021-01-07 11:02:00 +01:00
Gregoire Parant	8c89b5e0b1	Permit to change style when getCamera was ready and permission accorded	2021-01-07 10:30:28 +01:00
Gregoire Parant	d4c7a20dfa	Update feedback @moufmouf	2021-01-07 09:42:11 +01:00
Gregoire Parant	1659fa400f	Increase stability to force stopped screen sharing	2021-01-06 17:09:17 +01:00
kharhamel	fbb44af369	added a basic loader	2021-01-06 17:08:48 +01:00
Gregoire Parant	73d7e798e9	Upgrade conversion ... When user send multi message, scroll on last message	2021-01-06 17:08:13 +01:00
kharhamel	1359fbe977	updated phaser to version 3.51 and fixed the BC	2021-01-06 15:00:54 +01:00
Gregoire Parant	4397ff7712	Update style and focus keyboard	2021-01-06 13:36:18 +01:00
Gregoire Parant	438469ae24	Verify URL in message	2021-01-06 12:20:02 +01:00
kharhamel	6caa0e5b62	HOTFIX: the map property exitUrl now accept relative links that are deep enough to rewrite the base url	2021-01-05 18:23:17 +01:00
David Négrier	dea7d6dba7	Merge pull request #541 from Informatic/feature/map-sounds ... [rC3] front: implement map sounds	2021-01-05 13:42:50 +01:00
David Négrier	e02e051f91	Merge pull request #544 from thecodingmachine/updateMenu ... Update menu design	2021-01-04 18:10:27 +01:00
Gregoire Parant	ac92cbc8f7	Crate share menu and fix menu design	2021-01-04 17:13:41 +01:00
Piotr Dobrowolski	28d687e338	front: implement map sounds	2021-01-04 16:57:31 +01:00
Oliver Lorenz	7c89cf0e47	feat: adds property openWebsitePolicy to set allow property in iframe	2020-12-29 23:17:16 +01:00
Dariusz Niemczyk	640d994dda	Properly fix the CustomizeScene by limiting input ... When left/right arrow is being held on chrome the Phaser gets into infinite rendering loop that doesn't crash the browser but makes it slow to a crawl.	2020-12-27 11:00:23 +01:00
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
David Négrier	0984e7eaad	Fix linting	2020-12-17 22:35:38 +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	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
kharhamel	eb88db92be	FIX: going back a 2nd time to SelectCharacterScene used to crash the game	2020-12-16 15:09:58 +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
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
kharhamel	a1aedaa594	FEAT: now play a sound when a user quit the webrtc group	2020-12-11 16:01:31 +01: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	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	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	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	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