_Bastler
da81a712b9
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-10 15:55:36 +01:00
Alexis Faizeau
aa9b5e37c7
Merge pull request #1850 from thecodingmachine/stabilize-cowebsite
...
Fix Jitsi co-website reloading
2022-02-10 15:50:59 +01:00
Alexis Faizeau
666b6df588
Fix Jitsi co-website reloading
2022-02-10 15:37:04 +01:00
_Bastler
9f6158728a
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-10 14:02:31 +01:00
David Négrier
b851dd1f52
Merge pull request #1838 from thecodingmachine/stabilize-cowebsite
...
Fix cowebsite closing on fast opening/closing
2022-02-10 12:16:04 +01:00
Alexis Faizeau
7b6a3949bc
Move CoWebsite to generic class
2022-02-10 11:47:56 +01:00
_Bastler
71431165d6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-10 08:35:25 +01:00
Hanusiak Piotr
b32a2970e4
collisionGrid now updates on showing / hiding layers
2022-02-08 15:46:41 +01:00
Alexis Faizeau
f5f71f32ee
Fix cowebsite closing on fast opening/closing
2022-02-08 11:19:29 +01:00
_Bastler
a2e50dcd95
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-07 19:56:57 +01:00
David Négrier
41183e8bc2
Merge pull request #1828 from thecodingmachine/stabilize-cowebsite
...
Restore trigger message action on co-websites
2022-02-07 17:58:44 +01:00
Alexis Faizeau
60c17ecea2
Re-implement set width of main cowebsite
2022-02-07 14:55:51 +01:00
_Bastler
8a8abd2961
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-07 14:40:09 +01:00
Hanusiak Piotr
d480150728
cleaner approach to disable activatablesManager distance check if space-event
2022-02-07 14:22:43 +01:00
Hanusiak Piotr
4bae6e75b1
enable activating by distance if in JITSI and JITSI was already opened
2022-02-07 12:37:59 +01:00
Hanusiak Piotr
aec7790875
disable activation by distance if in JITSI
2022-02-07 12:36:33 +01:00
Hanusiak Piotr
72b4438d1e
outline color is decided from particular system level
2022-02-07 10:39:03 +01:00
_Bastler
301eaba90e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2022-02-02 16:42:18 +01:00
Hanusiak Piotr
45a7e9331b
ran prettier
2022-02-02 13:30:49 +01:00
_Bastler
ffe0f53907
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2022-02-02 10:21:13 +01:00
Hanusiak Piotr
0eaeaf7cfb
Merge branch 'develop' into feature-options-menu
2022-02-02 09:31:10 +01:00
Alexis Faizeau
da381e6e16
Fix cowebsite lazy load by API
2022-02-01 17:25:53 +01:00
Hanusiak Piotr
5aba99403e
merged develop
2022-01-31 10:00:39 +01:00
_Bastler
ab470ab18d
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2022-01-29 14:36:47 +01:00
Gregoire Parant
dfd594ec17
Fix screen sharing spinner
...
Check if the peer connection is already connected status. In this case, the status store must be set to 'connected'.
In the case or player A send stream and player B send a stream, it's same peer connection, also the status must be changed to connect.
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com >
2022-01-28 18:33:42 +01:00
Gregoire Parant
fc8330a3ad
Remove hideMyCamera function, not working correctly
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com >
2022-01-28 12:01:58 +01:00
_Bastler
6783598244
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2022-01-27 19:08:57 +01:00
Hanusiak Piotr
099d573296
cleanup
2022-01-27 16:50:25 +01:00
Alexis Faizeau
4f068c72be
Co-website management move to Svelte
2022-01-27 16:34:58 +01:00
Alexis Faizeau
0bf1acfefb
Improve game overlay UI
2022-01-27 16:34:58 +01:00
_Bastler
8c1b55f5db
i18n trigger message
2022-01-27 15:53:53 +01:00
Hanusiak Piotr
8b8c24f6ef
ActivatablesManager and little cleanup
2022-01-27 15:15:18 +01:00
Hanusiak Piotr
68c4a5f5ce
different approach
2022-01-27 14:05:30 +01:00
_Bastler
7e987ad470
latest dev + i18n
2022-01-27 13:03:59 +01:00
Hanusiak Piotr
2781b72799
wip with handling outlines for activitable objects
2022-01-26 17:14:22 +01:00
Hanusiak Piotr
b88ebbdf08
update distance values on remotePlayer movement
2022-01-26 15:38:08 +01:00
Hanusiak Piotr
dbd06bda4e
changing the way Outline is handled
2022-01-26 14:59:23 +01:00
Hanusiak Piotr
f42c7564b9
call activate() method on space key up
2022-01-26 13:16:52 +01:00
Hanusiak Piotr
3af6461c01
Activatable objects handling WIP
2022-01-26 12:57:10 +01:00
_Bastler
e3b58a0d56
prettier
2022-01-26 12:44:08 +01:00
Hanusiak Piotr
06d403ebe3
simplify actionsMenu
2022-01-26 10:40:13 +01:00
_Bastler
f2da041b7c
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2022-01-25 21:09:48 +01:00
David Négrier
ef2f8b141f
Merge pull request #1743 from thecodingmachine/move-to-from-hash-parameter
...
Move to from hash parameter
2022-01-25 14:12:26 +01:00
Hanusiak Piotr
69a2379e53
Merge branch 'develop' into feature-options-menu
2022-01-25 10:33:30 +01:00
Alexis Faizeau
2312d2e129
Merge pull request #1629 from thecodingmachine/translator
...
Translator: i18n
2022-01-25 09:48:48 +01:00
Alexis Faizeau
446b4639c7
Implement typesafe-i18n
2022-01-24 18:59:28 +01:00
Hanusiak Piotr
b5887bceb4
PR fixes
2022-01-24 17:03:14 +01:00
Hanusiak Piotr
3cc38e6bbe
Merge branch 'develop' into move-to-from-hash-parameter
2022-01-24 16:31:03 +01:00
Hanusiak Piotr
fd012d6c69
ActionsMenu WIP
2022-01-24 16:27:57 +01:00
_Bastler
e62fc4beed
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2022-01-24 10:15:44 +01:00