Commit Graph

3679 Commits

Author SHA1 Message Date
David Négrier
fae57e36e3
Merge pull request #1446 from thecodingmachine/develop
Deploy 2021-09-13
2021-09-13 11:27:22 +02:00
_Bastler
564e75d8cd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:25:09 +02:00
_Bastler
15404015f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:11:52 +02:00
David Négrier
8b4764912a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-13 10:47:02 +02:00
David Négrier
e3896bf5e7 Adding features to CHANGELOG 2021-09-13 10:45:32 +02:00
David Négrier
3be328af35
Merge pull request #1445 from thecodingmachine/fix-menu-pointer-too-large
Fixing broken sound controls
2021-09-13 10:38:42 +02:00
David Négrier
fbddd54059 Adding a test case for audio 2021-09-13 10:22:55 +02:00
David Négrier
f0b83663f6 Fixing broken sound controls
Because of the rework of the menu, the clickable zone for the menu was extending at the complete top of the screen, which caused interactive items at the top of the screen (like sound controls) to be broken.

This commit fixes this.
2021-09-13 10:06:08 +02:00
David Négrier
bfd418d8b5
Merge pull request #1436 from thecodingmachine/better_test_page
Adding more tests
2021-09-13 09:25:58 +02:00
David Négrier
62227bb15f
Merge pull request #1439 from thecodingmachine/increse_ilde_timeout
Fix disconnects after 5 minutes in Chrome
2021-09-13 09:25:35 +02:00
David Négrier
aa462258ff
Merge pull request #1441 from tabascoeye/patch-1
add the possibilities of "onaction" and message to  new "openTab" pro…
2021-09-13 09:20:56 +02:00
Lurkars
59c22c8dfc svelte check fix 2021-09-12 11:29:53 +02:00
Lurkars
e5b3088b5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-12 11:22:46 +02:00
Lurkars
3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
TabascoEye
94517c0f4b
add the possibilities of "onaction" and message to new "openTab" property 2021-09-10 23:17:04 +02:00
David Négrier
05646718a9 Fix disconnects after 5 minutes in Chrome
This commit increases idle timeout for websocket connection

Issue: after 5 minutes of inactive tab (hidden tab) in Chrome, WorkAdventure was disconnected.

I believe Google was going in "intensive throttling" mode (see  https://developer.chrome.com/blog/timer-throttling-in-chrome-88/#intensive-throttling)
This means setTimeouts are run only once per minute.

And I believe the "keep alive" must be implemented with a "setTimeout" (one way or another even if I can't find a trace of this in the code). This would mean that the browser would send keep alive requests only once per minute.
But the pusher is configured to shut the connection after 30 seconds of idle activity.

Therefore, the pusher disconnects inactive Chrome tabs. By raising the Pusher idle timer to 2 minutes, we give a chance to Chrome to send a ping to the server in time (since Chrome won't send more than 1 ping per minute).
2021-09-10 18:30:36 +02:00
_Bastler
90f7258c9a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-10 17:14:59 +02:00
_Bastler
6c8d268b05 update Svelte twemoji 2021-09-10 17:11:37 +02:00
_Bastler
bb3b58d8bf Twemoji Svelte 2021-09-10 17:06:46 +02:00
Lurkars
e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Kharhamel
352b05b1ea
Merge pull request #1431 from thecodingmachine/fixVideoHeight
FIX: the video element should not have a bigger height than its container
2021-09-10 16:54:47 +02:00
David Négrier
7cabf64b11 Adding more tests 2021-09-10 16:40:09 +02:00
Kharhamel
d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
Lurkars
b50253a529 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-10 15:10:11 +02:00
Lurkars
d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
Kharhamel
7471da6c26
Merge pull request #1434 from tabascoeye/patch-1
explain new property jitsiWidth
2021-09-10 14:09:28 +02:00
TabascoEye
9f310383ba
explain new property jitsiWidth 2021-09-09 22:58:30 +02:00
_Bastler
5497253e38 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 18:05:12 +02:00
David Négrier
5626e45f4a
Merge pull request #1430 from thecodingmachine/better_test_page
Improving design of the test page
2021-09-09 14:07:19 +02:00
_Bastler
e5aef085fa Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 12:38:11 +02:00
David Négrier
e715ca42c4 Improving design of the test page 2021-09-09 11:35:17 +02:00
grégoire parant
1e6433a65e
Merge pull request #1429 from thecodingmachine/develop
Next release v1.5.0
2021-09-09 11:27:05 +02:00
David Négrier
c07d853588
Merge pull request #1428 from thecodingmachine/more_test
Adding a new test case to check video display from mobile
2021-09-09 11:15:36 +02:00
David Négrier
24cd17ac51 Adding a new test case to check video display on mobile 2021-09-09 10:41:17 +02:00
David Négrier
7432f15e27
Merge pull request #1427 from Lurkars/fixFlattenGroupLayers
Fix flatten group layers
2021-09-09 10:20:05 +02:00
_Bastler
2fd8eb3c91 fix flatten layers 2021-09-09 08:56:26 +02:00
Lurkars
0530735547 .gitignore to upstream 2021-09-09 08:52:24 +02:00
Lurkars
8dd404801a .gitignore to upstream 2021-09-09 08:51:20 +02:00
Lurkars
30b22d87a6 .gitignore to upstream 2021-09-09 08:50:57 +02:00
Lurkars
36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
Lurkars
1db11a45e3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-09 08:37:28 +02:00
_Bastler
52489f9c72 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 08:25:41 +02:00
Gregoire Parant
2a0d3759b1 Merge branch 'develop'
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-08 18:26:48 +02:00
Gregoire Parant
3a3e5d5f3b Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
2021-09-08 18:20:13 +02:00
GRL78
2ea7b0cff1
Menu style will adapt if iframe in map is opened (#1422) 2021-09-08 15:43:46 +02:00
David Négrier
65b9da926b
Adding the menu of the workadventu.re website in this repo (#1420)
Because the workadventu.re website documentation regarding map building directly comes from that repo, it makes sense to export the menu in the repo.
This way, when we add a new documentation page, we can edit the menu in the same pull request.
2021-09-08 14:28:29 +02:00
David Négrier
d7a5435d9e
Adding documentation for the new "openTab" property (#1419) 2021-09-08 14:27:40 +02:00
grégoire parant
6cf86ec8dc
Add play uri for login and register in hydra (#1421)
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-08 13:39:46 +02:00
_Bastler
610ed9ae85 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 11:24:08 +02:00
David Négrier
149b417d8d
Merge pull request #1417 from thecodingmachine/doc_special_zones
Migrating documentation to this repository
2021-09-08 10:43:29 +02:00