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

4160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_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
David Négrier
767ac9a68f
Merge pull request #1780 from thecodingmachine/dependabot/npm_and_yarn/front/nanoid-3.2.0 
Bump nanoid from 3.1.30 to 3.2.0 in /front
 2022-01-27 17:05:51 +01:00
dependabot[bot]
1572ddc477
Bump nanoid from 3.1.30 to 3.2.0 in /front 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-27 15:50:53 +00:00
Hanusiak Piotr
099d573296 cleanup 2022-01-27 16:50:25 +01:00
Alexis Faizeau
f1a674225a
Merge pull request #1620 from thecodingmachine/embedScreens 
Improve UI & Cowebsites
 2022-01-27 16:50:10 +01:00
Alexis Faizeau
9efb718545 Display a loader while cowebsite icon is loading 2022-01-27 16:37:24 +01:00
Alexis Faizeau
b01b8b53eb Lowercase warning container hex colors 2022-01-27 16:34:58 +01:00
David Négrier
0dc6f41562 Fixing server name in K8S deployment 2022-01-27 16:34:58 +01:00
David Négrier
6848995639 Adding Icon server to CD env. 2022-01-27 16:34:58 +01:00
Alexis Faizeau
b9ca630a15 Jitsi cowebsite close on hangup 2022-01-27 16:34:58 +01:00
David Négrier
a4b4710f87 Menu bar for buttons 2022-01-27 16:34:58 +01:00
David Négrier
06dca9813c Removing weird border in cowebsites and cowebsite button 2022-01-27 16:34:58 +01:00
David Négrier
78e816c6fb Removing optimization in dev to get back normal compilation times in watch mode 2022-01-27 16:34:58 +01:00
David Négrier
873c335054 Removing too wide border in videos 2022-01-27 16:34:58 +01:00
Alexis Faizeau
4436db0d3d Add new cowebsite properties on documention 2022-01-27 16:34:58 +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
Alexis Faizeau
5f1dd09cb9 Implement minimizer for css/scss 2022-01-27 16:34:58 +01:00
Alexis Faizeau
9695064e82 Implement breakpoints utils on SCSS and JS 2022-01-27 16:34:58 +01:00
Alexis Faizeau
56d8f62dd0 Add a new test map for co-website with trigger property 2022-01-27 16:33:11 +01:00
Alexis Faizeau
d7121d4192 Add fonts & png files built to the gitignore file 2022-01-27 16:33:11 +01:00
David Négrier
89ba62c898
Merge pull request #1748 from thecodingmachine/pre-compile-front 
Pre-compile frontend and add environment config script (2)
 2022-01-27 16:00:59 +01:00
_Bastler
8c1b55f5db i18n trigger message 2022-01-27 15:53:53 +01:00
David Négrier
d18e9162b9 Generating i18n files before build 2022-01-27 15:51:23 +01:00