Commit Graph

2540 Commits

Author SHA1 Message Date
_Bastler
71431165d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 08:35:25 +01:00
Hanusiak Piotr
c58eeb8a0f Merge branch 'develop' into feature-voice-chat-indicator 2022-02-09 14:02:44 +01:00
Hanusiak Piotr
c13672c9dc updated invitation link creator 2022-02-09 13:03:14 +01:00
Hanusiak Piotr
b565080312 parse x and y position from moveTo param 2022-02-09 10:52:44 +01:00
Hanusiak Piotr
fe570c9117 moveTo object position 2022-02-09 10:17:31 +01:00
Hanusiak Piotr
20267d3483 Merge branch 'develop' into fix-issue-1835 2022-02-09 09:35:43 +01:00
Hanusiak Piotr
b32a2970e4 collisionGrid now updates on showing / hiding layers 2022-02-08 15:46:41 +01:00
Hanusiak Piotr
9cfebecde2 parallaxx and parallaxy made optional 2022-02-08 13:32:02 +01:00
Hanusiak Piotr
57bd8783e0 scroll factor applied automatically 2022-02-08 13:17:35 +01:00
Hanusiak Piotr
d6f0c19838 cr fixes #1 2022-02-08 11:54:18 +01:00
_Bastler
88e20290bd fix svelte world 2022-02-08 11:20:51 +01:00
Alexis Faizeau
f5f71f32ee Fix cowebsite closing on fast opening/closing 2022-02-08 11:19:29 +01:00
Hanusiak Piotr
a53cbbff34 create test map 2022-02-08 11:04:12 +01:00
Hanusiak Piotr
6f7bdf8fe4 hide talk-clouds if conversation is over 2022-02-08 10:23:07 +01:00
_Bastler
a2e50dcd95 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-07 19:56:57 +01:00
Alexis Faizeau
31f3b2b48e
Merge pull request #1834 from thecodingmachine/stabilize-cowebsite
Remove priority on iframe add to cowebsites
2022-02-07 18:42:52 +01:00
Alexis Faizeau
7334d59c4f Remove priority on iframe add to cowebsites 2022-02-07 18:41:24 +01:00
David Négrier
3953b78cfe
Merge pull request #1823 from lukashass/fix-vscode-prettier
Remove explicit definition of prettier-plugin-svelte
2022-02-07 18:39:32 +01:00
Alexis Faizeau
5dc3fbcce5
Merge pull request #1833 from thecodingmachine/stabilize-cowebsite
Fix multi cowebsite creation by trigger
2022-02-07 18:24:04 +01:00
Alexis Faizeau
c770846558 Fix multi cowebsite creation by trigger 2022-02-07 18:23:02 +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
21c198a882
Merge pull request #1831 from thecodingmachine/fix-language-display
Somes bugs due to i18n implementation
2022-02-07 17:33:59 +01:00
Alexis Faizeau
433d3a20c6 Fix raw html not displayed buy terms translation key 2022-02-07 17:32:05 +01:00
Alexis Faizeau
c2da4c3906 Fix active custom menu button 2022-02-07 17:25:55 +01:00
Alexis Faizeau
75d42209f4 Hide main cowebsite 2022-02-07 17:09:52 +01:00
Hanusiak Piotr
330b6ea1c5 prettier 2022-02-07 15:10:20 +01:00
Hanusiak Piotr
e34a72c865 merged develop 2022-02-07 15:09:18 +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
c29ce6e9a9 prettier 2022-02-07 14:23:34 +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
Alexis Faizeau
9571a52f1e Re-implement action message on cowebsite trigger 2022-02-07 11:21:04 +01:00
Hanusiak Piotr
bf0d2eb412 directional shift for current player when trying to activate entities 2022-02-07 11:08:52 +01:00
Hanusiak Piotr
72b4438d1e outline color is decided from particular system level 2022-02-07 10:39:03 +01:00
_Bastler
104f792444 remove warning 2022-02-04 15:05:58 +01:00
_Bastler
9054174c40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-04 15:04:36 +01:00
Alexis Faizeau
6863fa3764 Fix game unfocusable after clicking on iframe 2022-02-04 14:46:57 +01:00
Lukas Hass
de5a505296
remove explicit definition of prettier-plugin-svelte
fixes prettier in vscode
2022-02-03 19:26:25 +01:00
_Bastler
86ac7372a7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 19:20:53 +01:00
Hanusiak Piotr
d087bc02e9 TalkIcon animation 2022-02-03 16:00:29 +01:00
Alexis Faizeau
137bd831a9 Fix main cowebsite switcher 2022-02-03 15:20:30 +01:00
Alexis Faizeau
b91de4a91d Replace favicon by meet icon on jitsi cowebsite thumbnail 2022-02-03 15:03:42 +01:00
Hanusiak Piotr
a4cd626c41 SoundMeterWidget no longer instantiate new SoundMeter 2022-02-03 14:51:47 +01:00
Alexis Faizeau
1b93bf666f Remove translate from warning message 2022-02-03 14:38:53 +01:00
Hanusiak Piotr
40aae25e11 listen to local volume change only if in bubble conversation 2022-02-03 13:43:20 +01:00
Hanusiak Piotr
4424c7cce1 prevent SoundMeter from being initialized if stream has no audio tracks available 2022-02-03 12:58:31 +01:00
_Bastler
f21f51c006 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 12:39:32 +01:00
Hanusiak Piotr
e0f5529fa7 catch no audio track error 2022-02-03 12:21:30 +01:00
Alexis Faizeau
7e9343f1b7 Fix mozaic layout 2022-02-03 11:17:11 +01:00
Alexis Faizeau
4a9cc57d60 Cancelable companion resource 2022-02-03 11:17:11 +01:00
_Bastler
b0faec0459 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 11:08:03 +01:00
David Négrier
9696b0ab04
Merge pull request #1818 from thecodingmachine/fix-character-collider
applied proper offset for circle collider of Character
2022-02-03 10:25:42 +01:00
Hanusiak Piotr
010c176708 applied proper offset for circle collider of Character 2022-02-03 10:13:17 +01:00
Hanusiak Piotr
be60d0ef03 fixed actions-menu not appearing 2022-02-03 09:50:52 +01:00
_Bastler
9a17af1a74 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 19:18:03 +01:00
Hanusiak Piotr
4b7278b843 add brackets to the condition 2022-02-02 16:42:38 +01:00
_Bastler
301eaba90e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 16:42:18 +01:00
Hanusiak Piotr
a7b0516ac4 move with touch or right click 2022-02-02 16:38:43 +01:00
Hanusiak Piotr
87dde50251 some logs 2022-02-02 16:32:51 +01:00
Hanusiak Piotr
2c880c65b6 talk indicators wip 2022-02-02 15:47:38 +01:00
Hanusiak Piotr
288f8ebb61 merged develop 2022-02-02 14:32:57 +01:00
Hanusiak Piotr
45a7e9331b ran prettier 2022-02-02 13:30:49 +01:00
_Bastler
f7b92f843e merge dev 2022-02-02 10:21:24 +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
8bd0d648d4
Merge pull request #1811 from thecodingmachine/visual-cowebsite-icon
Enhance UX co-website opening
2022-02-01 18:52:46 +01:00
Alexis Faizeau
33e1a369de Add trigger message on cowebsite alt 2022-02-01 18:42:07 +01:00
David Négrier
45fe234d00
Merge pull request #1804 from thecodingmachine/fix-customize-woka-missing-buttons
removed unnecessary wake event unregistering
2022-02-01 18:15:19 +01:00
Alexis Faizeau
7e966a7381 Animate cowebsite icons 2022-02-01 17:52:10 +01:00
Alexis Faizeau
da381e6e16 Fix cowebsite lazy load by API 2022-02-01 17:25:53 +01:00
grégoire parant
bc03182129
Merge pull request #1807 from thecodingmachine/fix-safari-bug-joystick
fixed bugged safari's joystick
2022-02-01 16:42:45 +01:00
_Bastler
468adf4f64 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 16:07:09 +01:00
Hanusiak Piotr
43b821a4f2 fixed canvasBounds being wrongly calculated due to the resize / setZoom execution order 2022-02-01 15:49:23 +01:00
Alexis Faizeau
1124ed5a5e Implement cancelable woka resource 2022-02-01 15:17:04 +01:00
Hanusiak Piotr
27b7bb0dca removed unnecessary wake event unregistering 2022-02-01 12:55:29 +01:00
Hanusiak Piotr
520184fdeb add talk-icon 2022-02-01 12:25:14 +01:00
_Bastler
0e84293720 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 07:58:11 +01:00
Nolway
541aa78a1f Define max height on streamable 2022-01-31 14:29:01 +01:00
_Bastler
6cea6a3ce0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-31 13:57:46 +01:00
Hanusiak Piotr
c3d04efe9b removed mock action from RemotePlayer 2022-01-31 13:01:47 +01:00
Hanusiak Piotr
989897cb01 added isActivatable() method to implement through interface 2022-01-31 13:00:14 +01:00
Hanusiak Piotr
2322f5f76d some improvements with registering menu actions 2022-01-31 12:26:37 +01:00
Nolway
965725dd71 Remove border radius on video elements 2022-01-31 11:58:12 +01:00
Nolway
feeb20fb5d Prettier fixes into video management 2022-01-31 11:50:07 +01:00
Nolway
d2bfa75b37 Video peer without stream can be highlighted 2022-01-31 11:48:12 +01:00
Nolway
50b752a205 Fix streamable display after left a group 2022-01-31 11:41:30 +01:00
Nolway
4400c79b93 Fix local streamable toggle highlighted 2022-01-31 11:40:16 +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
d590b81446 Fix redirect error after invalid token
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-29 14:05:05 +01:00
Gregoire Parant
60b6bc6f75 Updating of warning message when we try to close screen sharing
Trying to close screen sharing is alway process when a peer connection is closed.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-28 19:34:15 +01:00
Gregoire Parant
31b7b5aa08 Add name on screen sharing
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-28 19:17:40 +01:00
Gregoire Parant
15be76655f Add todo to improve status management
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-28 18:42:48 +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
Alexis Faizeau
34c077f470
Merge pull request #1789 from thecodingmachine/fix-errors
Fix i18n error message
2022-01-28 15:47:07 +01:00
grégoire parant
790c7175cf
Merge pull request #1785 from thecodingmachine/fix_camera_light
Remove hideMyCamera function, not working correctly
2022-01-28 15:25:56 +01:00
Alexis Faizeau
bea99711e4 Fix i18n error message 2022-01-28 15:11:57 +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