_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,163 Commits 2 Branches 0 Tags
fd6b5220f0bcc34dc533a24500e7d0e5b5ebbe9a
Commit Graph

658 Commits

Author SHA1 Message Date
_Bastler fd6b5220f0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:33:44 +02:00
David Négrier 70d5c7f658 Triggering onload even if file already loaded for files loaded via http:// 2021-10-15 16:14:17 +02:00
_Bastler 315be013e6 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:07:01 +02:00
David Négrier 79a5916057 Removing dead code 2021-10-15 15:08:06 +02:00
_Bastler 78161bd98a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-13 10:30:12 +02:00
Kharhamel 726f52976d FEATURE: analytics client now scrape user email and room group 2021-10-11 16:30:01 +02:00
_Bastler fa61e42b1d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-06 16:16:12 +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
_Bastler 3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +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
_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 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 148540dafe emojimenu, audiomanager 2021-09-14 08:56:37 +02:00
Lurkars 91bc524e06 disable controls 2021-09-14 08:50:43 +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
_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 f320184d23 latest dev 2021-09-06 18:36:31 +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 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
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
kharhamel 52fe79df47 FEATURE: improved the mediaStore code to disable tracks instead of deleting them 2021-09-01 17:14:05 +02:00
_Bastler 29b790ec32 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 14:58:52 +02:00
jonny 0272e4f691 merged in develop again 2021-09-01 14:55:29 +02:00
jonny 7971daa27f openTabPropertyKey (create new props in own file) 2021-09-01 14:50:48 +02:00
TabascoEye da03e60de4 Update GameScene.ts 
typo fixed
 2021-08-30 19:42:18 +02:00
¯\_(ツ)_/¯ ae3e2a09d9 add possibility to set size of coWebsite and Jitsis via map property 2021-08-30 19:32:02 +02:00
_Bastler a633f79dd7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 20:19:30 +02:00