_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,017 Commits 2 Branches 0 Tags 47 MiB
ffe0f53907
Commit Graph

4017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
ffe0f53907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-02 10:21:13 +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
331068c965
Merge pull request #1809 from thecodingmachine/fix-errors 
Fix cowebsite lazy load by API
 2022-02-01 17:56:48 +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
5337f0dda2
Merge pull request #1803 from thecodingmachine/fix-errors 
Implement cancelable woka resource
 2022-02-01 15:26:08 +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
Alexis Faizeau
315e2f6417
Merge pull request #1800 from thecodingmachine/fix-my-cam 
Define max height on streamable
 2022-01-31 14:29:42 +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
Alexis Faizeau
4210334aa2
Merge pull request #1798 from thecodingmachine/fix-my-cam 
Fix bugs on new camera display
 2022-01-31 12:57:03 +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
_Bastler
ab470ab18d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-29 14:36:47 +01:00
grégoire parant
462cb53101
Merge pull request #1793 from thecodingmachine/fix_redirect_lastroomurl 
Fix redirect error after invalid token
 2022-01-29 14:16:34 +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
grégoire parant
561fbd7bec
Merge pull request #1790 from thecodingmachine/fix_screensharing_spinner 
Fix screensharing spinner
 2022-01-28 19:50:31 +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
David Négrier
673a18864d
Merge pull request #1784 from thecodingmachine/fix_user_walking_infinitely 
Fixing users walking infinitely
 2022-01-28 11:20:37 +01:00
David Négrier
9a7140b027 Fixing users walking infinitely 
Now, if no event is received from the Pusher after MAX_EXTRAPOLATION_TIME, the
moving variable of the user is set to false.

So if a client does not send an update on time (for instance if the user switched
tab while walking), on the screen of others, the woka will appear to stop.
 2022-01-28 11:10:47 +01:00
David Négrier
dd920c96db Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2022-01-28 10:16:59 +01:00
David Négrier
f602833c73
Merge pull request #1783 from thecodingmachine/fix_freeze_on_mapstore 
Fixing a freeze in MapStore on several unsubscribes
 2022-01-28 10:16:42 +01:00
grégoire parant
b831ad3c9e
Merge pull request #1782 from thecodingmachine/updateNameAndWokaOnVideoContainer 
Change style of woka and name on video container
 2022-01-28 10:10:44 +01:00
David Négrier
e43c4cd5ae Fixing a freeze in MapStore on several unsubscribes 
For some reason (I could not reproduce this in unit tests alas), the unsubscribe function
could be called several times in a row, leading to a complete map freeze.

Closes #1736
 2022-01-28 09:58:24 +01:00
_Bastler
54f936860b Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-28 08:01:54 +01:00
David Négrier
4aee41f9fd
Merge pull request #1781 from thecodingmachine/fix_link_encoding_in_chat 
Fix the way links are encoded in chat
 2022-01-27 23:00:37 +01:00
David Négrier
d1c549335b Fix the way links are encoded in chat 
Closes #1776
 2022-01-27 22:55:32 +01:00
Gregoire Parant
949b73d900 Fix style 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-27 20:33:33 +01:00
Gregoire Parant
b38081515b Change style of woka and name on video container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-27 20:10:29 +01:00
_Bastler
ed687bf3bf Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-27 19:09:17 +01:00
_Bastler
6783598244 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-27 19:08:57 +01:00
David Négrier
f5464fb1af Fixing bad return in controller 2022-01-27 18:46:28 +01:00
David Négrier
12d6d9a50d Disabling completely routes if admin token not configured 2022-01-27 18:38:33 +01:00