lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
3105 commits 21 branches 1 tag 50 MiB
Commit graph

3105 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Négrier
ad39b43df3 Closing game webcame in Jitsi 
When stepping in Jitsi, the game webcam (from mediaManager) was not shut down.
And when enabling/disabling the webcam in Jitsi, the webcam in mediaManager was also
enabled/disabled. This PR fixes those issues.

It also fixes a race condition when closing a Jitsi where the mic/cam would be enabled at the same time.
 2021-05-11 14:52:51 +02:00
David Négrier
03a0402b3e
Merge pull request #1033 from thecodingmachine/use_visibility_change_api 
Refactoring code to use the "visibilitychange" event
 2021-05-11 14:50:22 +02:00
Kharhamel
78d4985d10
Merge pull request #1028 from thecodingmachine/fixOnMapExit 
FIX: triggering a map transition now ignores other map transitions for 500ms
 2021-05-11 14:21:06 +02:00
kharhamel
f044b3d249 FIX: triggering a map transition now ignores other map transitions for 500ms 2021-05-11 11:05:05 +02:00
David Négrier
23bf78a026 Refactoring code to use the "visibilitychange" event 
Using the "visiblitychange" event instead of relying on a "trick" related to RAF being disabled when a window is not open allows us to have cleaner code.
Bonus: the recursive call to "setTimeout" is gone, so the stacktrace growing indefinitely is gone too.
This should make the application a bit more stable.
 2021-05-11 10:56:50 +02:00
David Négrier
0229f09ec6
Merge pull request #1032 from thecodingmachine/CheryPickDicussionCircle 
Improve focus/blur discussion circle
 2021-05-11 10:17:15 +02:00
Gregoire Parant
e50aad0ea0 Add WA logo 2021-05-11 10:13:50 +02:00
Gregoire Parant
52b1c6733b Notification & Camera 
- Notification when user is first and not focus on the tab
- Camera focus when user is in discussion circle and back on tab with previous config camera settings
- Camera stay blur if user is in discussion circle and not back on the tab

# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2021-05-11 10:13:38 +02:00
David Négrier
5f6d9e060c
Merge pull request #1027 from thecodingmachine/fix_resize_helpcamera 
Fixing "camera popup" always display on resize
 2021-05-11 10:05:52 +02:00
GRL
ab7b06f71e Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-11 09:44:53 +02:00
jonny
8cef4f6e90 Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read 
# Conflicts:
#	front/src/Api/IframeListener.ts
 2021-05-10 21:48:11 +02:00
jonny
2c4c98b0e5 limited event trigger to max 10 per second 2021-05-10 21:44:15 +02:00
jonny
8e136cebe8 added callback on playermove - gets quite delayed after walking for a few seconds 2021-05-10 21:27:17 +02:00
grégoire parant
0fd743bcac
HotFix sound meter (#1029) 2021-05-10 20:49:17 +02:00
grégoire parant
bd4cf5d7f7
Fix error context sound meter (#1009) 2021-05-10 19:55:43 +02:00
David Négrier
0411d5e493 Fixing "camera popup" always display on resize 
This fixes a bug where the "camera popup" window was always displayed when the screen was resized.
 2021-05-10 19:05:01 +02:00
David Négrier
58482f8ae6 Improving Changelog 2021-05-10 19:01:29 +02:00
dependabot[bot]
003bdf18cb
Bump hosted-git-info from 2.8.8 to 2.8.9 in /messages 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 16:58:41 +00:00
dependabot[bot]
e0d496c7b7
Bump hosted-git-info from 2.8.8 to 2.8.9 in /benchmark 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 16:57:51 +00:00
dependabot[bot]
50ee2e9810
Bump hosted-git-info from 2.8.8 to 2.8.9 in /uploader 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 16:57:50 +00:00
David Négrier
a95d592659
Merge pull request #1004 from thecodingmachine/dependabot/npm_and_yarn/back/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /back
 2021-05-10 18:57:46 +02:00
dependabot[bot]
25d1e575ef
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 16:57:45 +00:00
David Négrier
4606173ed1
Merge pull request #1003 from thecodingmachine/dependabot/npm_and_yarn/messages/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /messages
 2021-05-10 18:57:30 +02:00
David Négrier
954b87db41
Merge pull request #1002 from thecodingmachine/dependabot/npm_and_yarn/maps/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /maps
 2021-05-10 18:57:16 +02:00
David Négrier
cd8501d80e
Merge pull request #1001 from thecodingmachine/dependabot/npm_and_yarn/uploader/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /uploader
 2021-05-10 18:57:04 +02:00
GRL
cf811c547b documentation of show/hide layer simplification 2021-05-10 17:29:50 +02:00
GRL
973b3405ef documentation of show/hide layer 2021-05-10 15:10:11 +02:00
GRL
fd931c4884 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 14:45:41 +02:00
GRL
8edd29abaa suppression console.log 2021-05-10 14:43:00 +02:00
dependabot[bot]
3b6daa99c0
Bump hosted-git-info from 2.8.8 to 2.8.9 in /back 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 11:50:12 +00:00
Kharhamel
6e868408ed
Merge pull request #1018 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging 3
 2021-05-10 12:45:25 +02:00
kharhamel
d1f1c8f470 added back automatic deploy of staging 3 2021-05-10 12:44:35 +02:00
David Négrier
d2bab4e7ef
Merge pull request #1017 from thecodingmachine/change_xxxplayercontrol_name 
Renaming restorePlayerControls/disablePlayerControls
 2021-05-10 12:35:34 +02:00
Kharhamel
dfc57d0529
Merge pull request #1016 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging  2
 2021-05-10 12:29:11 +02:00
kharhamel
de1768b7bb added back automatic deploy of staging 2 2021-05-10 12:20:46 +02:00
David Négrier
c025d1798b Renaming restorePlayerControls/disablePlayerControls 
Putting "controls" in the plural form:

- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
 2021-05-10 12:18:06 +02:00
David Négrier
3a82481d70 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-05-10 12:10:57 +02:00
David Négrier
c1da898c59
Merge pull request #1015 from thecodingmachine/markdown_doc 
Splitting scripting API doc in 2
 2021-05-10 12:09:20 +02:00
David Négrier
293c57568e Splitting scripting API doc in 2 
Splitting scripting API doc in 2 docs:

- scripting.md: contains the explaination on how to enable scripting
- api-reference.md: contains the list of all available functions
 2021-05-10 12:08:52 +02:00
Kharhamel
8cb32c34b5
Merge pull request #1014 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging
 2021-05-10 12:03:23 +02:00
kharhamel
9a8b10bbf5 added back automatic deploy of staging 2021-05-10 11:56:08 +02:00
GRL
cd2d090a8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 11:46:16 +02:00
GRL
841bf29764 auto update show/hide layer 2021-05-10 11:20:07 +02:00
GRL
a6ba8d41b9 implement show/hide layer with scripting 2021-05-10 11:19:18 +02:00
David Négrier
945ff446a9
Merge pull request #1012 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:56:43 +02:00
David Négrier
e0ac8abd51
Merge pull request #1011 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:54:16 +02:00
David Négrier
bc88a7d3ed Adding Markdown documentation relative to scripting 2021-05-10 10:47:55 +02:00
jonny
ce0c7ea3eb Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read 2021-05-10 10:01:53 +02:00
jonny
8aa34cecef Merge branch 'load-page-api' of github.com:jonnytest1/workadventure into load-page-api 2021-05-10 09:59:12 +02:00
jonny
a5260c0831 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 2021-05-10 09:58:59 +02:00