Commit graph

311 commits

Author SHA1 Message Date
David Négrier 6e27ffb2d5 Starting fixing unhandled promises 2022-01-04 16:50:43 +01:00
David Négrier b5778c386f
Merge pull request #1692 from workadventure-xce/fix/user-select
Disable user selection of UI elements
2022-01-04 08:55:21 +01:00
David Négrier 5234cbe3f3
Merge pull request #1689 from Lurkars/fixAudioPlayerSrc
fix audio player src
2022-01-03 18:25:38 +01:00
PizZaKatZe 5460bd49be Fix follow requests via keyboard 2021-12-31 15:35:21 +01:00
PizZaKatZe c55cad6227 Disable user selection of UI elements 2021-12-31 15:27:08 +01:00
Lurkars e7022e96d7 fix audio player src 2021-12-30 16:48:02 +01:00
David Négrier d37165219c Migrating followStates and followRoles from a const object to a type restricted to only the string values allowed.
This allows for more secure code (compilation checks) and simpler code too (we can pass strings instead of const values)
2021-12-24 15:49:25 +01:00
David Négrier 840f8626ad Refactoring code to use Svelte native "$" store unpacking. 2021-12-24 15:39:28 +01:00
David Négrier a1cfaa0225 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-24 15:06:15 +01:00
David Négrier 87bc7f8099 Slightly improving follow request popup design 2021-12-24 14:36:38 +01:00
David Négrier fefe7c8aa5 Removing the "Ask others to follow you?" popup
No need to ask twice, the user just pressed the "follow" button.
2021-12-24 13:48:35 +01:00
Alban Bruder 00e0a14a37 Display multiple admin messages 2021-12-24 12:15:54 +01:00
Gregoire Parant 5d729d0560 Fix message Warning Container
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-24 12:02:47 +01:00
David Négrier 524339a3a0 Adding hightlight to player names when they follow each others 2021-12-23 18:07:51 +01:00
David Négrier 368a115b4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-23 16:04:59 +01:00
Gregoire Parant efa57d2754 Fix pretier
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-23 15:06:32 +01:00
Gregoire Parant 96d46e96c2 Fix svelte error
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-23 14:52:42 +01:00
Gregoire Parant df3c618ffa Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
2021-12-23 14:23:08 +01:00
Gregoire Parant fd64fc43a4 Finish 2 days room limit
- Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-23 13:09:28 +01:00
Gregoire Parant 60f4cf75c3 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-23 10:02:46 +01:00
Alban Bruder 85c07e3723 Fix admin message update in frontend 2021-12-21 13:03:24 +01:00
PizZaKatZe 21b1313a18 Get rid of buggy open state 2021-12-20 12:50:43 +01:00
Lurkars 3916d9c58e Add follow button to ui, improved flow 2021-12-20 11:35:06 +01:00
Lurkars 2cd088c049 Change follow request to "F" button, use nes-css buttons 2021-12-18 11:58:30 +01:00
PizZaKatZe d3297a448e Add setting that ignores follow invites 2021-12-15 19:47:14 +01:00
PizZaKatZe e3e7fba539 Rename InteractMenu/-Store => FollowMenu/-Store 2021-12-15 18:50:59 +01:00
PizZaKatZe 2bd71790b5 Use user IDs instead of names 2021-12-15 18:42:24 +01:00
PizZaKatZe 7bff782f7f Improve follow abort message; avoid having to change it in backend 2021-12-15 18:42:24 +01:00
PizZaKatZe 0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
David Négrier e2afb6ec02
Merge pull request #1626 from workadventure-xce/fix/mapProperties
Display link to map in map credits if provided in map properties
2021-12-15 17:12:34 +01:00
David Négrier 7ec8cd2a5b Fixing CI 2021-12-14 16:16:42 +01:00
David Négrier 0e68490e75 Refactoring with a MapStore
A great deal of the complexity of the current code is that we must chain
2 reactive values (one in the map "GameScene.MapPlayersByKey" and one in
the snapshot store).

The new generic MapStore class can be used to listen to stores inside a map.
When the store inside the map, or the map itself is modified, the
resulting store is updated.
2021-12-14 14:47:25 +01:00
PizZaKatZe 80794975aa Add new layer property audioCopyright 2021-12-11 22:24:28 +01:00
PizZaKatZe aad582df70 Display map link in map credits if provided 2021-12-11 22:23:54 +01:00
Gregoire Parant 9357afd13f Update warning container
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-10 01:54:48 +01:00
Gregoire Parant a5d4d163e1 Add test mode
`*` char permit to defined test mode with warning message

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-10 01:51:40 +01:00
Hanusiak Piotr 8eaacdf2e5 companion pictures store 2021-12-07 16:37:24 +01:00
Hanusiak Piotr 5efa17651c show woka-icon with camera on 2021-12-07 16:07:58 +01:00
Hanusiak Piotr cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
Hanusiak Piotr 731f616cce woka icon inside menu 2021-12-07 14:56:42 +01:00
Hanusiak Piotr b36f39d3d9 revert menu icon to its original view 2021-12-07 14:01:30 +01:00
Hanusiak Piotr e62ad6b9c9 merged develop 2021-12-07 13:56:28 +01:00
David Négrier 2f8bd52dba
Merge pull request #1628 from workadventure-xce/feat/force-cowebsite-triggers
New setting: Always ask before opening cowebsites / Jitsi meetings
2021-12-07 10:42:33 +01:00
PizZaKatZe d49d44d7ea New setting: Always ask before opening cowebsites / Jitsi meetings 2021-12-06 23:25:25 +01:00
PizZaKatZe a71fc40b5d Fix volume slider UI updates 2021-12-06 21:54:33 +01:00
David Négrier c27662c315 Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests 2021-12-06 18:07:47 +01:00
Alexis Faizeau c95e20c677 Lint & Prettier fixes on Svelte files 2021-12-06 16:36:05 +01:00
Hanusiak Piotr 8016cf3c1a fallback in case of CanvasRenderer 2021-12-04 16:29:28 +01:00
Hanusiak Piotr a62cfe1cd8 fallback if avatar could not be loaded 2021-12-04 15:36:11 +01:00
Hanusiak Piotr ecb334cbd2 fixed Woka picture positioning 2021-12-04 15:36:11 +01:00
Hanusiak Piotr 642d3bb301 Changed the way WOKA's are stored 2021-12-04 15:36:11 +01:00
Hanusiak Piotr dcd8e57853 images are blurred no more 2021-12-04 15:36:11 +01:00
Hanusiak Piotr 7b94ac644d working woka picture if no camera view is provided 2021-12-04 15:36:11 +01:00
Hanusiak Piotr f4ce82481e avatar as a menu button 2021-12-04 15:36:11 +01:00
David Négrier fcf0888864 Adding a reconnect feature in case first Pusher request fails
Now, if the first pusher request fails, a waiting message will be displayed and the application will reconnect when the pusher comes back alive or the network connection is established again.
2021-12-01 14:14:02 +01:00
Gregoire Parant e5979998c5 Update design of credit page
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:28:54 +01:00
Gregoire Parant 0614fa7b47 HotFix copy link to share it
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:03:54 +01:00
Gregoire Parant e073d70098 Merge branch 'develop' into openidAdminConnect
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-12 17:01:26 +01:00
Gregoire Parant 461dee776c Update css 2021-11-12 16:22:37 +01:00
Gregoire Parant 49f68451ae Update profile menu and change UX
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-12 15:31:49 +01:00
Gregoire Parant d3f120f2bb Update to have token when user is connected
- Update menu design

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-12 12:13:44 +01:00
Alexis Faizeau 624593e425 Implement twemoji on emote 2021-11-10 16:55:20 +01:00
David Négrier 60a82c5eb2
Merge pull request #1516 from thecodingmachine/iframeManager
Display multi co-websites
2021-10-29 15:33:56 +02:00
Gregoire Parant 385ea1360e Type Chat message Store
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-27 10:02:47 +02:00
Alexis Faizeau da8cc661b7 Implement the new co website system 2021-10-25 19:00:26 +02:00
Gregoire Parant a8d6024352 Fix share link for website
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-15 15:25:23 +02:00
Kharhamel 60eefbce94
Merge pull request #1508 from thecodingmachine/fixSilentZones
FIX: being in a silent zone new forces mediaConstraints to false
2021-10-07 14:50:40 +02:00
Kharhamel 9dd3e8ff85 FIX: being in a silent zone new forces mediaConstraints to false 2021-10-06 17:59:20 +02:00
grégoire parant 900c53f499
Update icon message and profile (#1504)
- Add new icon profil pixel
 - Add new icon message pixel
 - Migrate message icon in svelt menu

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-06 15:36:42 +02:00
grégoire parant b33e271d2e
Merge pull request #1499 from thecodingmachine/develop
Release 1.5.3
2021-10-04 20:54:13 +02:00
Kharhamel 02108ce977 FIX: fixes for the emnote menu 2021-10-04 14:43:19 +02:00
Alexis Faizeau 8c3b708981
Remove audio manager range volume control by keys (#1489)
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2021-10-02 15:55:54 +02:00
David Négrier 2b5211d098
Merge pull request #1486 from thecodingmachine/fix-links
Fixing links in the documentation
2021-09-27 15:41:23 +02:00
David Négrier b8996d5abb Fixing links in the documentation 2021-09-27 11:13:35 +02:00
GRL78 3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401)
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 20:24:53 +02:00
Gregoire Parant 3f954d273c Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 02:37:56 +02:00
grégoire parant e77d4dda84
Update favicon and logo to deploy new design (#1475)
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-20 22:42:15 +02:00
Lurkars 63c4eeb4c7 Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:20:42 +02:00
Lurkars 7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
GRL78 680e538fd6
save button in settings close menu (#1451) 2021-09-14 16:43:00 +02:00
David Négrier 9006283c90
Merge pull request #1452 from Lurkars/audioPlayerImprovements
some fixes on the audio player controls
2021-09-14 14:41:40 +02:00
Lurkars f1bd92fa52 use included twemoji mozilla font instead of loading external 2021-09-14 11:39:36 +02:00
GRL ff3e844b68 chat scroll to bottom when it open 2021-09-14 09:36:49 +02:00
Lurkars 34d81b0e6c fix behaviour 2021-09-14 08:55:15 +02:00
Lurkars 91bc524e06 disable controls 2021-09-14 08:50:43 +02:00
Lurkars beed50874b fix emotemenu on open jitsi rooms 2021-09-13 19:16:47 +02:00
David Négrier f0b83663f6 Fixing broken sound controls
Because of the rework of the menu, the clickable zone for the menu was extending at the complete top of the screen, which caused interactive items at the top of the screen (like sound controls) to be broken.

This commit fixes this.
2021-09-13 10:06:08 +02:00
Lurkars 59c22c8dfc svelte check fix 2021-09-12 11:29:53 +02:00
Lurkars e5b3088b5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-12 11:22:46 +02:00
Lurkars 3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
Lurkars e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Kharhamel d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
GRL78 2ea7b0cff1
Menu style will adapt if iframe in map is opened (#1422) 2021-09-08 15:43:46 +02:00
kharhamel fa9929757d FIX: reimplemented the old stream behavior on bad navigators like chrome 2021-09-07 16:39:44 +02:00
grégoire parant 4f0bb95a38
Emote silent zone (#1342)
* Add an emote when the user is in silent zone

* Update silent icon strategy

* Update strategy for silent zone

 - Add svelte store
 - Show silent zone indication and replace camera

This update permit to hide silent zone when user is in Jitsi discussion

* Fix css silent zone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-05 18:36:22 +02:00
grégoire parant d2b8d7dc04
Active authentication Oauth (#1377)
* Active authentication Oauth

 - Google authentication
 - GitHub authentication
 - Linkedin authentication

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish connexion et get user info connexion

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix lint error

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change the expires token for 30 days

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update connexion stratgey

 - Set last room when it will be created and not when connexion is openned
 - Add '/login' end point permit to logout and open iframe to log user
 - Add logout feature permit to logout in front

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Implement logout and revoke token with hydra

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix pull develop conflict

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile url (#1399)

* Create function that permit to get profile URL

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Continue profil user

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Add menu and logout button

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update last room use

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile callback permit to get url profile setting from admin

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish profile show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete profileUrl will be not use today

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Correct lint

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update size of iframe

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete console log

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update feedback ARP

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-05 18:17:49 +02:00
grégoire parant a0d863569b
WIP: Bypass camera scene (#1337)
* Set new local camera setup variable

* Finish by pass video settings

 - TODO add button to update camera settings

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Merge branch 'develop' into jumpVideoCamera

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/LocalUserStore.ts
#	front/src/Phaser/Components/Loader.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Login/EnableCameraScene.ts

* Add menu to open enable camera scene

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish jump camera setup

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-04 21:31:36 +02:00
kharhamel ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
Lurkars 49b1a55042 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-09-01 19:25:37 +02:00
Kharhamel 095a486621
Merge pull request #1402 from thecodingmachine/betterMEdiaStore
FEATURE: improved the mediaStore code to disable tracks instead of deleting them
2021-09-01 17:30:59 +02:00