Commit Graph

2444 Commits

Author SHA1 Message Date
_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
_Bastler
86ac7372a7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 19:20:53 +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
Alexis Faizeau
1b93bf666f Remove translate from warning message 2022-02-03 14:38:53 +01:00
_Bastler
f21f51c006 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 12:39:32 +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
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
_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