Commit Graph

1326 Commits

Author SHA1 Message Date
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
_Bastler 0164d24329 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 16:25:25 +02:00
Lurkars 781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
_Bastler 49bd6f8a1c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 15:17:30 +02:00
_Bastler 54346896b9 fix 2021-09-20 09:53:25 +02:00
_Bastler 1e43229956 fix? 2021-09-20 09:33:50 +02:00
_Bastler afa12641aa undo 2021-09-20 09:30:36 +02:00
_Bastler 9650453edc quick fix 2021-09-20 09:27:18 +02:00
_Bastler 22c501e5e0 quick fix? 2021-09-20 09:24:47 +02:00
_Bastler 6af1651e03 remove instance, change room url, fix invalid lastRoomUrls 2021-09-20 08:56:14 +02:00
_Bastler f053ece7da remove old, fix nginx 2021-09-17 10:23:00 +02:00
_Bastler 0bf49fa26a native OIDC support 2021-09-17 09:46:04 +02:00
_Bastler 3a9ffd7557 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 18:39:06 +02:00
_Bastler b47201687a better we.bslty & deveop integration 2021-09-16 18:24:03 +02:00
Lurkars 7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
Kharhamel 483191c521 Merge pull request #1458 from thecodingmachine/posthog
FEATURE: added posthog as new analytics tool
2021-09-16 15:24:27 +02:00
Kharhamel 2e111aa13a FEATURE: added posthog as new analytics tool 2021-09-16 15:16:10 +02:00
_Bastler f69fe463de Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 16:52:39 +02:00
David Négrier 801ec3bf4c Turn off audio on exit
If an exit zone is overlapping an audio zone, when exiting, the audio is stopped.
We do this by actually triggering the fact that a user should "leave" all active zones when exiting.
2021-09-15 15:28:55 +02:00
_Bastler 63e756c1d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 13:08:33 +02:00
David Négrier d26325d8dc Fixing silent zone not respected when exiting Jitsi
Now, when a silent zone is adjacent to a Jitsi, it is enforced, even after leaving the Jitsi zone
2021-09-15 11:16:23 +02:00
_Bastler 0067a8edc2 fix external resources for twemoji 2021-09-14 11:44:45 +02:00
_Bastler 148540dafe emojimenu, audiomanager 2021-09-14 08:56:37 +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
_Bastler 15404015f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:11:52 +02:00
Lurkars 3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
TabascoEye 94517c0f4b add the possibilities of "onaction" and message to new "openTab" property 2021-09-10 23:17:04 +02:00
_Bastler bb3b58d8bf Twemoji Svelte 2021-09-10 17:06:46 +02:00
Lurkars e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Lurkars d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
_Bastler e5aef085fa Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 12:38:11 +02:00
_Bastler 2fd8eb3c91 fix flatten layers 2021-09-09 08:56:26 +02:00
Lurkars 36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
_Bastler 64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00
_Bastler f320184d23 latest dev 2021-09-06 18:36:31 +02:00
kharhamel 4160235b92 ran pretty on the front 2021-09-06 14:31:59 +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
_Bastler 22ff1cc82e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 19:31:40 +02:00
kharhamel ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
_Bastler 62e164de9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-02 19:18:25 +02:00
David Négrier 86858a176e Merge pull request #1406 from thecodingmachine/fix/recursive_variables
Allowing variables nested in group layers
2021-09-02 18:37:27 +02:00
David Négrier 68a4772627 Allowing variables nested in group layers
Up until this commit, variables nested in object layers inside group layers where not found by the front nor the back.
This PR changes analysis so that variables can be detected.
2021-09-02 18:05:55 +02:00
Kharhamel 8d2da6bdc7 Merge pull request #1405 from jonnytest1/opentab2
openTabPropertyKey (create new props in own file)
2021-09-02 17:19:20 +02:00
_Bastler 8715781bbd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 19:24:26 +02:00
jonny 606e9093e1 renamed 2021-09-01 18:16:31 +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