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

2269 Commits

Author SHA1 Message Date
Hanusiak Piotr
57bd8783e0 scroll factor applied automatically 2022-02-08 13:17:35 +01:00
Hanusiak Piotr
d6f0c19838 cr fixes #1 2022-02-08 11:54:18 +01:00
Alexis Faizeau
f5f71f32ee Fix cowebsite closing on fast opening/closing 2022-02-08 11:19:29 +01:00
Hanusiak Piotr
a53cbbff34 create test map 2022-02-08 11:04:12 +01:00
Hanusiak Piotr
6f7bdf8fe4 hide talk-clouds if conversation is over 2022-02-08 10:23:07 +01:00
Gregoire Parant
876ddc87d2 Change accès token with query privateAccessToken in the url 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-07 19:26:34 +01:00
Alexis Faizeau
7334d59c4f Remove priority on iframe add to cowebsites 2022-02-07 18:41:24 +01:00
Alexis Faizeau
5dc3fbcce5
Merge pull request #1833 from thecodingmachine/stabilize-cowebsite 
Fix multi cowebsite creation by trigger
 2022-02-07 18:24:04 +01:00
Alexis Faizeau
c770846558 Fix multi cowebsite creation by trigger 2022-02-07 18:23:02 +01:00
David Négrier
41183e8bc2
Merge pull request #1828 from thecodingmachine/stabilize-cowebsite 
Restore trigger message action on co-websites
 2022-02-07 17:58:44 +01:00
Alexis Faizeau
21c198a882
Merge pull request #1831 from thecodingmachine/fix-language-display 
Somes bugs due to i18n implementation
 2022-02-07 17:33:59 +01:00
Alexis Faizeau
433d3a20c6 Fix raw html not displayed buy terms translation key 2022-02-07 17:32:05 +01:00
Alexis Faizeau
c2da4c3906 Fix active custom menu button 2022-02-07 17:25:55 +01:00
Alexis Faizeau
75d42209f4 Hide main cowebsite 2022-02-07 17:09:52 +01:00
Hanusiak Piotr
330b6ea1c5 prettier 2022-02-07 15:10:20 +01:00
Hanusiak Piotr
e34a72c865 merged develop 2022-02-07 15:09:18 +01:00
Alexis Faizeau
60c17ecea2 Re-implement set width of main cowebsite 2022-02-07 14:55:51 +01:00
Hanusiak Piotr
c29ce6e9a9 prettier 2022-02-07 14:23:34 +01:00
Hanusiak Piotr
d480150728 cleaner approach to disable activatablesManager distance check if space-event 2022-02-07 14:22:43 +01:00
Hanusiak Piotr
4bae6e75b1 enable activating by distance if in JITSI and JITSI was already opened 2022-02-07 12:37:59 +01:00
Hanusiak Piotr
aec7790875 disable activation by distance if in JITSI 2022-02-07 12:36:33 +01:00
Alexis Faizeau
9571a52f1e Re-implement action message on cowebsite trigger 2022-02-07 11:21:04 +01:00
Hanusiak Piotr
bf0d2eb412 directional shift for current player when trying to activate entities 2022-02-07 11:08:52 +01:00
Hanusiak Piotr
72b4438d1e outline color is decided from particular system level 2022-02-07 10:39:03 +01:00
Alexis Faizeau
6863fa3764 Fix game unfocusable after clicking on iframe 2022-02-04 14:46:57 +01:00
Lukas Hass
f8d0a91776
add generic to pass undefined type 2022-02-03 18:47:51 +01:00
Hanusiak Piotr
d087bc02e9 TalkIcon animation 2022-02-03 16:00:29 +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
Hanusiak Piotr
a4cd626c41 SoundMeterWidget no longer instantiate new SoundMeter 2022-02-03 14:51:47 +01:00
Alexis Faizeau
1b93bf666f Remove translate from warning message 2022-02-03 14:38:53 +01:00
Hanusiak Piotr
40aae25e11 listen to local volume change only if in bubble conversation 2022-02-03 13:43:20 +01:00
Hanusiak Piotr
4424c7cce1 prevent SoundMeter from being initialized if stream has no audio tracks available 2022-02-03 12:58:31 +01:00
Hanusiak Piotr
e0f5529fa7 catch no audio track error 2022-02-03 12:21:30 +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
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
Lukas Hass
2e115efdc5
convert lang="typescript" to lang="ts" 
see https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#why-isnt-vite-detecting-my-imports-correctly-in-svelte-files-with-typescript
 2022-02-03 02:40:55 +01:00
Lukas Hass
ee92e19be6
Merge branch 'develop' into vite 2022-02-03 02:38:46 +01:00
Hanusiak Piotr
4b7278b843 add brackets to the condition 2022-02-02 16:42:38 +01:00
Hanusiak Piotr
a7b0516ac4 move with touch or right click 2022-02-02 16:38:43 +01:00
Hanusiak Piotr
87dde50251 some logs 2022-02-02 16:32:51 +01:00
Hanusiak Piotr
2c880c65b6 talk indicators wip 2022-02-02 15:47:38 +01:00
Hanusiak Piotr
288f8ebb61 merged develop 2022-02-02 14:32:57 +01:00
Hanusiak Piotr
45a7e9331b ran prettier 2022-02-02 13:30:49 +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
Lukas Hass
5890e9c5cb
remove await import simple-peer 2022-02-01 18:41:54 +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
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
Lukas Hass
5f6be1fb8c
use getEnvConfig from plugin 2022-02-01 14:35:38 +01:00
Hanusiak Piotr
27b7bb0dca removed unnecessary wake event unregistering 2022-02-01 12:55:29 +01:00
Hanusiak Piotr
520184fdeb add talk-icon 2022-02-01 12:25:14 +01:00
Lukas Hass
f87704b2ef
remove redundant font loading 
see fd70d89061/README.md (custom)
 2022-02-01 01:29:38 +01:00
Lukas Hass
446aa6cbe3
fix simple-peer import 2022-02-01 00:34:48 +01:00
Lukas Hass
1b41e794da
fix loading env config 2022-02-01 00:34:18 +01:00
Lukas Hass
0dcadd474f
convert lang="typescript" to lang="ts" 
see https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#why-isnt-vite-detecting-my-imports-correctly-in-svelte-files-with-typescript
 2022-01-31 17:30:07 +01:00
Nolway
541aa78a1f Define max height on streamable 2022-01-31 14:29:01 +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
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
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
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
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
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
David Négrier
d1c549335b Fix the way links are encoded in chat 
Closes #1776
 2022-01-27 22:55:32 +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
Hanusiak Piotr
099d573296 cleanup 2022-01-27 16:50:25 +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
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
873c335054 Removing too wide border in videos 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
9695064e82 Implement breakpoints utils on SCSS and JS 2022-01-27 16:34:58 +01:00
David Négrier
d1a88dd375 Merge branch 'develop' of github.com:thecodingmachine/workadventure into pre-compile-front 2022-01-27 15:41:51 +01:00
Hanusiak Piotr
8b8c24f6ef ActivatablesManager and little cleanup 2022-01-27 15:15:18 +01:00
Hanusiak Piotr
68c4a5f5ce different approach 2022-01-27 14:05:30 +01:00
David Négrier
fe031579d9
Fixing typo 2022-01-27 10:24:19 +01:00
Hanusiak Piotr
2781b72799 wip with handling outlines for activitable objects 2022-01-26 17:14:22 +01:00
Hanusiak Piotr
b88ebbdf08 update distance values on remotePlayer movement 2022-01-26 15:38:08 +01:00
Hanusiak Piotr
dbd06bda4e changing the way Outline is handled 2022-01-26 14:59:23 +01:00
Hanusiak Piotr
f42c7564b9 call activate() method on space key up 2022-01-26 13:16:52 +01:00
Hanusiak Piotr
3af6461c01 Activatable objects handling WIP 2022-01-26 12:57:10 +01:00
Lurkars
2252bc79ff prettier 2022-01-26 12:39:20 +01:00
Lurkars
c4e5a41376 add emoji translation 2022-01-26 12:34:51 +01:00
Lurkars
15a2b7fe02 Merge branch 'develop' of github.com:thecodingmachine/workadventure into i18n-de-DE 2022-01-26 12:33:11 +01:00
grégoire parant
7ef2bdaad4
Merge pull request #1756 from thecodingmachine/emoji-menu-text 
Enhance emoji menu
 2022-01-26 11:55:19 +01:00
Hanusiak Piotr
5ae039b987 little cleanup 2022-01-26 10:54:51 +01:00
Lurkars
8858fccd18 fix Translation 2022-01-26 10:46:42 +01:00
Hanusiak Piotr
06d403ebe3 simplify actionsMenu 2022-01-26 10:40:13 +01:00
Lurkars
a808819a11 fix de-DE index.js 2022-01-26 10:38:40 +01:00
Lurkars
a55e5373fc added de-DE translation, fix quality small vs. minimum 2022-01-26 10:33:07 +01:00
David Négrier
2cf51a058a
Merge pull request #1757 from ValdoTR/typos 
Fixed some typos :)
 2022-01-25 21:06:24 +01:00
Valdo Romao
aefb28d895 Fixed some typos :) 2022-01-25 19:43:27 +00:00
Lukas Hass
4108076373
Merge branch 'develop' into pre-compile-front 2022-01-25 18:02:04 +01:00
Alexis Faizeau
30ebb90617 Enchance emoji menu 2022-01-25 17:42:43 +01:00
Hanusiak Piotr
58227a39f8 destroy actionsMenu on RemotePlayer destroy() 2022-01-25 17:13:52 +01:00
Hanusiak Piotr
88f3032298 do not move player if clicked on Player or RemotePlayer. Close actionsMenu on second click 2022-01-25 15:47:21 +01:00
Hanusiak Piotr
907026463d scrollable actions 2022-01-25 15:09:34 +01:00
David Négrier
ef2f8b141f
Merge pull request #1743 from thecodingmachine/move-to-from-hash-parameter 
Move to from hash parameter
 2022-01-25 14:12:26 +01:00
Hanusiak Piotr
67627637aa added store with actions for actionsMenu 2022-01-25 13:42:41 +01:00
Gregoire Parant
9c381d1a07 Fix yarn pretty 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-25 11:52:31 +01:00
Gregoire Parant
7a7addb061 Change Warning Container with Yellow color 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-25 11:37:29 +01:00
Hanusiak Piotr
69a2379e53 Merge branch 'develop' into feature-options-menu 2022-01-25 10:33:30 +01:00
Hanusiak Piotr
934a59e59f improved way of getting hash parameters 2022-01-25 10:05:04 +01:00
Alexis Faizeau
2312d2e129
Merge pull request #1629 from thecodingmachine/translator 
Translator: i18n
 2022-01-25 09:48:48 +01:00
Alexis Faizeau
446b4639c7 Implement typesafe-i18n 2022-01-24 18:59:28 +01:00
Hanusiak Piotr
b5887bceb4 PR fixes 2022-01-24 17:03:14 +01:00
Alexis Faizeau
4829964127 Display correctly the username on Brave browser 2022-01-24 16:55:58 +01:00
Hanusiak Piotr
3cc38e6bbe Merge branch 'develop' into move-to-from-hash-parameter 2022-01-24 16:31:03 +01:00
Hanusiak Piotr
fd012d6c69 ActionsMenu WIP 2022-01-24 16:27:57 +01:00
Lukas Hass
6f24780874
Allow returning empty strings 2022-01-24 11:54:00 +01:00
Lukas Hass
7863774dca
Return value from process.env if it exists 2022-01-24 11:53:01 +01:00
Lukas Hass
00464f7144
Test for window existence on global object 
This fixes running tests in Jasmine where window not defined
 2022-01-24 11:29:26 +01:00
David Négrier
d8327d1b72
Apply suggestions from code review 
Fixing missing return attribute in doc
 2022-01-22 22:20:41 +01:00
Lukas Hass
5dabd0b2f8
Pre-compile frontend and add environment config script 2022-01-21 21:01:34 +01:00
David Négrier
0be77164ec Translating retry connection error message and fixing E2E tests 2022-01-21 17:09:29 +01:00
David Négrier
51c3f1d972 Refactoring translator to use "_" instead of "translator._". 
This is shorter and pollutes less the code.
 2022-01-21 17:09:29 +01:00
Alexis Faizeau
1789f36a63 Implement zod checking on translator compiler 2022-01-21 17:09:29 +01:00
Alexis Faizeau
68dc7c2555 Fix languageFound type error on build 2022-01-21 17:09:29 +01:00
Nolway
54ae3bf215 Add language switcher on settings 2022-01-21 17:09:29 +01:00
Nolway
bd01a35cc6 Add en-US translations 2022-01-21 17:09:29 +01:00
Nolway
41ef9fd49f Replace cookie by local storage to store language 2022-01-21 17:09:29 +01:00
Nolway
8286cdd41d Add WA.player.language in the API 2022-01-21 17:09:29 +01:00
Nolway
77f8426788 Add translator documentation 2022-01-21 17:09:29 +01:00
Nolway
8a2767ef40 Implement Translator: i18n system 2022-01-21 17:09:29 +01:00
Hanusiak Piotr
cebb803b2b added test for moveTo command 2022-01-20 15:47:49 +01:00
Hanusiak Piotr
e87c0a07a4 moveTo parameter working if layer is found 2022-01-20 15:10:54 +01:00
Hanusiak Piotr
cb0c5beecf get additional hash parameters from url 2022-01-20 14:14:24 +01:00
Hanusiak Piotr
dd03a2d1ff Merge branch 'develop' into feature-move-character-api 2022-01-20 13:00:31 +01:00
Hanusiak Piotr
b088e63290 little fixes for moveTo example and with event return data 2022-01-20 10:04:19 +01:00
Hanusiak Piotr
bf6b9a7c83 do not call joystick logic if not on mobile 2022-01-20 09:39:41 +01:00
Hanusiak Piotr
62b00f852d throw an exception if no path found when using player.moveTo command. Cancelling path following no longer rejects the promise 2022-01-19 17:22:28 +01:00
David Négrier
0409422a44
Merge pull request #1732 from thecodingmachine/remove-last-message 
Remove the last message before adding a new chat peer
 2022-01-19 15:51:05 +01:00
David Négrier
fd88399938
Simplifying if condition 2022-01-19 15:45:16 +01:00
Alexis Faizeau
30811e7702 Remove the last message before add a new chat peer 2022-01-19 15:44:12 +01:00
Hanusiak Piotr
8f40e7a33c reject path following path promise if interrupted 2022-01-19 14:16:05 +01:00
Hanusiak Piotr
c023c4f8fd optional following path movement speed 2022-01-19 13:53:06 +01:00
Hanusiak Piotr
9b94705177 manually resolve promise on certain events for player path following 2022-01-19 13:09:17 +01:00
Hanusiak Piotr
f78392ceab Pathfinding manager will now return path steps in pixel units by default 2022-01-19 12:30:08 +01:00
Hanusiak Piotr
f96eac4737 Merge branch 'walking-shortest-path' into feature-move-character-api 2022-01-19 10:54:19 +01:00
Hanusiak Piotr
9e5d8f5d9c cr fixes 2022-01-19 10:37:56 +01:00
Hanusiak Piotr
29e44d3023 Player move API wip 2022-01-19 09:34:06 +01:00
Hanusiak Piotr
1c4e803dd7 move to the nearest tile if possible 2022-01-18 12:33:46 +01:00
Hanusiak Piotr
67cd0dfb29 disable context menu. Move player only on left-click 2022-01-18 11:18:52 +01:00
Hanusiak Piotr
391fe7eed3 for pathfinding we are now taking into consideration all tiles, looking for 'collides' property 2022-01-18 10:26:40 +01:00
Hanusiak Piotr
7576cea7e0 removed obsolete comments. Pass path as reference 2022-01-17 16:11:08 +01:00
Hanusiak Piotr
3e81278e72 proper player movement on click 2022-01-17 16:04:59 +01:00
Hanusiak Piotr
e557e8ea72 player following the path wip 2022-01-17 14:36:00 +01:00
Hanusiak Piotr
77ee39110f handle pointerup event 2022-01-17 11:52:02 +01:00
Hanusiak Piotr
28543be121 Player class is no longer dependent on UserInputManager 2022-01-17 11:37:28 +01:00
Hanusiak Piotr
173d10738d created interface to implement for UserInputManager 2022-01-17 11:16:42 +01:00
Hanusiak Piotr
000b2cfe73 created PathfindingManager. WIP 2022-01-14 12:49:18 +01:00
David Négrier
82c2d21423
Merge pull request #1654 from thecodingmachine/feature-camera-management 
Feature camera management
 2022-01-14 11:57:05 +01:00
Hanusiak Piotr
7ee41bad30 change setViewport action to set for CameraAPI 2022-01-14 11:41:37 +01:00
Hanusiak Piotr
17e9c3c586 handle instant camera view change 2022-01-14 11:31:49 +01:00
Hanusiak Piotr
c2b2385e96 Camera now centers on focusable zone properly 2022-01-13 18:54:38 +01:00
Hanusiak Piotr
a164cedf3f Camera FocusTarget width and height are now optional 2022-01-13 16:43:58 +01:00
Hanusiak Piotr
d99930a67e save last zoom value if setting the camera viewport without locking it 2022-01-13 16:17:49 +01:00
Hanusiak Piotr
d62b116e5d merge setPosition and focusOn into setViewport 2022-01-13 16:08:16 +01:00
David Négrier
57d2dec756
Merge pull request #1724 from thecodingmachine/master 
Backport fix 2022-01-13
 2022-01-13 15:59:54 +01:00
Hanusiak Piotr
a1c96b0524 merged develop 2022-01-13 10:44:06 +01:00
David Négrier
9425fd70c0 Adding a new property to prevent script from being loaded in "modules" mode 
Scripts in module mode need to be abide by the Same Origin Policy (CORS headers are used to load them)
This can cause issues on some setups.

This commit adds a new "scriptDisableModuleSupport" that can be used to disable the "modules" mode.

Closes #1721
 2022-01-12 17:36:31 +01:00
Hanusiak Piotr
905bd079ec camera is now properly focusing on target when zooming, if any 2022-01-12 12:58:27 +01:00
Hanusiak Piotr
58af1f05f7 unlocking zooming with a delay when entering / leaving focusable zone 2022-01-12 12:08:11 +01:00
Alexis Faizeau
3f3f488924
Merge pull request #1718 from thecodingmachine/master 
Hot fixes
 2022-01-12 10:47:27 +01:00
jonny
786448a2b2 prettier fix 2022-01-09 23:21:07 +01:00
jonny
73ab4f3a26 prettier fix 2022-01-09 23:18:38 +01:00
jonny
e5afac1df5 prettier fix 2022-01-09 23:17:17 +01:00
jonny
954d39bb0c always set hash 2022-01-09 13:51:44 +01:00
David Négrier
0fb09cc431 Fixing closing of all websites. 2022-01-06 12:27:00 +01:00
David Négrier
787cc508b8
Merge pull request #1708 from thecodingmachine/fix_firefox_private_browsing 
Fixing WA crashing in Firefox private mode
 2022-01-06 11:57:12 +01:00
David Négrier
d713c82568 Fixing WA crashing in Firefox private mode 
Due to the way we now handle the browser cache, previously ignored errors in the Cache API were now explicitly thrown, preventing the loading of Firefox in private mode.
This commit fixes the issue and improves the stacktrace display of errors at the same time.
 2022-01-06 11:55:43 +01:00
David Négrier
ab0f5e9837 Stopping sending literal errors 
Errors now must be of "Error" type.
Rule added in eslint.
 2022-01-06 10:52:06 +01:00
David Négrier
f82012d315 Flagging Room.isPublic property as deprecated 2022-01-05 16:30:41 +01:00
David Négrier
968e71cbca Removing completely any analysis of the URL from the front. 
Instead, data related to room is sent from the admin, via the pusher.
 2022-01-05 14:32:02 +01:00
David Négrier
c85679b42c Merge branch 'develop' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 10:19:23 +01:00
David Négrier
24baf5664c All promises are now handled 2022-01-04 17:06:29 +01:00
David Négrier
6e27ffb2d5 Starting fixing unhandled promises 2022-01-04 16:50:43 +01:00
David Négrier
bade2b41b6
Merge pull request #1693 from jonnytest1/patch-2 
added columns type definition
 2022-01-04 08:57:46 +01:00
David Négrier
b5778c386f
Merge pull request #1692 from workadventure-xce/fix/user-select 
Disable user selection of UI elements
 2022-01-04 08:55:21 +01:00
David Négrier
5234cbe3f3
Merge pull request #1689 from Lurkars/fixAudioPlayerSrc 
fix audio player src
 2022-01-03 18:25:38 +01:00
David Négrier
4eb2ebd034
Merge pull request #1680 from workadventure-xce/fix/follow-via-keyboard 
Fix follow requests via keyboard
 2022-01-03 18:24:03 +01:00
David Négrier
fb69476b97
Merge pull request #1698 from thecodingmachine/ts-proto 
Migrating front protobuf encode/decode to ts-proto lib
 2022-01-03 18:07:19 +01:00
David Négrier
6bd9a998f9 Removing unused messages 2022-01-03 16:26:52 +01:00
David Négrier
b0ee4fc633
Merge pull request #1696 from ngc4622/iframe-division-by-zero 
ScaleManager: do not apply new size if width is zero
 2022-01-03 16:01:01 +01:00
David Négrier
bf070c33b5 Migrating front protobuf encode/decode to ts-proto lib 
The ts-proto lib has the huge advantage of producing code the "Typescript" way and not the "Java" way.
In particular, for "oneof" types in protobuf, it is generating "ADT" that can be used to check if we forgot or not to deal with a type.
 2022-01-03 15:52:46 +01:00
Benedicte Quimbert
ac27ab7e3e Revert "WIP enable/disable tutorial according to the map 'tutorial' property" 
This reverts commit 47a6710b60e3856bf57c0700fe33bec95c6fc6dd.
 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
85d45071fa Makes onCameraUpdate subscribe-able 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
d9482d484b WIP enable/disable tutorial according to the map 'tutorial' property 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
99f9d56c5c Updates room documentation for embeddedWebsite properties 2022-01-03 11:45:47 +01:00
Bénédicte Q
a69f232a06 Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-01-03 11:45:47 +01:00
Bénédicte Q
adc71b5695 Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
3abc571e79 Corrects scale managing and camera event listening 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
2a7c8f3786 Reverts adding scale to the camera updated event and uses it directly from the website manager 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
1e073d8a0e Refactoring and documentation update 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
4356767739 Adds the camera to available APIs with retrieving of the worldView 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
d672a2dead WIP API updates for tutorial and more 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
c53f0c6c8c Fixes deleting SharedVariablesManager's close() function 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
cbf7cdfe29 Cleans forgotten useless commentaries 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
516d756db1 Uses the current player position rather than the starting one to position iframe 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
3490daed6b Creates player state and uses it to get and set values from local storage 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
e025c1dc8e Allows to read and write "Player properties" from LocalStorage 2022-01-03 11:45:47 +01:00
Tobias Tefke
0603d08572 ScaleManager: do not apply new size if width is zero 
If the game width reaches zero (e.g by resizing a cowebsite manually),
a division by zero happens when calculating the new zoom.
This results in NaN, which causes phaser to reach an invalid state when rezooming.
 2022-01-03 09:09:21 +01:00
jonnytest1
8cdbf382ad
added columns type definition 2021-12-31 15:55:17 +01:00
PizZaKatZe
bda46be466 Remove left-over debug message 2021-12-31 15:35:21 +01:00
PizZaKatZe
5460bd49be Fix follow requests via keyboard 2021-12-31 15:35:21 +01:00
PizZaKatZe
c55cad6227 Disable user selection of UI elements 2021-12-31 15:27:08 +01:00
Lurkars
e7022e96d7 fix audio player src 2021-12-30 16:48:02 +01:00
Alexis Faizeau
68431c5242
Merge branch 'develop' into master 2021-12-30 13:18:13 +01:00
Alexis Faizeau
b148a46e3c Remove unused policy type from ApiData typeguard 2021-12-30 12:51:52 +01:00
David Négrier
36ce4f8f29
Merge pull request #1664 from Chasethechicken/layers 
Add missing layer properties
 2021-12-24 16:10:15 +01:00
David Négrier
d37165219c Migrating followStates and followRoles from a const object to a type restricted to only the string values allowed. 
This allows for more secure code (compilation checks) and simpler code too (we can pass strings instead of const values)
 2021-12-24 15:49:25 +01:00
David Négrier
840f8626ad Refactoring code to use Svelte native "$" store unpacking. 2021-12-24 15:39:28 +01:00
David Négrier
a1cfaa0225 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-24 15:06:15 +01:00
David Négrier
87bc7f8099 Slightly improving follow request popup design 2021-12-24 14:36:38 +01:00
David Négrier
fefe7c8aa5 Removing the "Ask others to follow you?" popup 
No need to ask twice, the user just pressed the "follow" button.
 2021-12-24 13:48:35 +01:00
Alban Bruder
380328079b
Merge branch 'develop' into feature-admin-message-queue 2021-12-24 12:49:08 +01:00
Alban Bruder
00e0a14a37 Display multiple admin messages 2021-12-24 12:15:54 +01:00
Gregoire Parant
5d729d0560 Fix message Warning Container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-24 12:02:47 +01:00
David Négrier
4a7be94b92 Fixing bug in redirect handling of rooms 2021-12-23 21:36:13 +01:00
David Négrier
524339a3a0 Adding hightlight to player names when they follow each others 2021-12-23 18:07:51 +01:00
David Négrier
368a115b4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-23 16:04:59 +01:00
Gregoire Parant
efa57d2754 Fix pretier 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 15:06:32 +01:00
David Négrier
d54e129fbe Fixing bug in redirect handling of rooms 2021-12-23 14:53:03 +01:00
Gregoire Parant
96d46e96c2 Fix svelte error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 14:52:42 +01:00
Gregoire Parant
df3c618ffa Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
 2021-12-23 14:23:08 +01:00
Gregoire Parant
fd64fc43a4 Finish 2 days room limit 
- Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 13:09:28 +01:00
David Négrier
9efa115982 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-23 11:04:20 +01:00
David Négrier
35463930a0 Sending color outline on connect 2021-12-23 10:22:19 +01:00
Gregoire Parant
60f4cf75c3 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 10:02:46 +01:00
David Négrier
482ba9690a Sharing outline color changes in real time 2021-12-22 18:34:36 +01:00
Chasethechicken
6cae134c8f Fix indentation 
To make prettier happy
 2021-12-22 10:13:26 +01:00
Chasethechicken
1ea7b45c7e Fix misplaced semicolon 2021-12-21 23:26:15 +01:00
David Négrier
90f7287860 Adding the ability to set the player's color outline via the scripting API 
(currently not shared with the other players yet)
 2021-12-21 17:02:53 +01:00
Alban Bruder
85c07e3723 Fix admin message update in frontend 2021-12-21 13:03:24 +01:00
Chasethechicken
6f4fe47808 Add missing layer properties 
Enables map makers to set the alpha, visibility, origin and size of layers.

Co-authored-by: jonny <ga86lad@mytum.de>
 2021-12-21 11:31:14 +01:00
PizZaKatZe
50147db895 Block running in follow mode 2021-12-20 13:36:29 +01:00
PizZaKatZe
21b1313a18 Get rid of buggy open state 2021-12-20 12:50:43 +01:00
Lurkars
3916d9c58e Add follow button to ui, improved flow 2021-12-20 11:35:06 +01:00
Lurkars
2cd088c049 Change follow request to "F" button, use nes-css buttons 2021-12-18 11:58:30 +01:00
Hanusiak Piotr
f8353bd7b5 send camera update event from CameraManager 2021-12-17 11:05:11 +01:00
David Négrier
b2bcfde5b1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into upgrade_typescript_4.5 2021-12-16 16:07:17 +01:00
David Négrier
0c281db411 More eslint fixes (+ ignoring no-unsafe-argument rule for now) 2021-12-16 15:57:37 +01:00
Hanusiak Piotr
4ebc55a429 subtle changes in CameraManager in order to distinguish between setPosition and focusOn 2021-12-16 14:31:26 +01:00
Hanusiak Piotr
5f26a39a5d added basic WA.camera commands 2021-12-16 13:41:28 +01:00
David Négrier
98d3a58861 Improving typings of VirtualJoystick 2021-12-16 10:04:55 +01:00
David Négrier
fa2e583d48 Reimporting correctly types moved to /messages 2021-12-16 10:04:41 +01:00
PizZaKatZe
a481376633 Clean up remaining debug log messages 2021-12-15 20:11:47 +01:00
PizZaKatZe
d3297a448e Add setting that ignores follow invites 2021-12-15 19:47:14 +01:00
PizZaKatZe
e3e7fba539 Rename InteractMenu/-Store => FollowMenu/-Store 2021-12-15 18:50:59 +01:00
PizZaKatZe
2bd71790b5 Use user IDs instead of names 2021-12-15 18:42:24 +01:00
PizZaKatZe
1ab8165951 Process input events in follow mode as well 2021-12-15 18:42:24 +01:00
PizZaKatZe
290e5131e9 Clean up follow implementation; stop following when leader leaves the scene 2021-12-15 18:42:24 +01:00
PizZaKatZe
7bff782f7f Improve follow abort message; avoid having to change it in backend 2021-12-15 18:42:24 +01:00
PizZaKatZe
0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
PizZaKatZe
1fca99c0d1 Send follow me request to all players 2021-12-15 18:41:36 +01:00
PizZaKatZe
e7f1395809 Stop before running into followed Avatar; stop sprite animation 2021-12-15 18:36:12 +01:00
danb
372dda792f Fix issue of interrupted conversation in follow-mode 2021-12-15 18:36:12 +01:00
danb
7c7144527c Add minimum distance to enable following 2021-12-15 18:36:12 +01:00
danb
f340e8114d Implement automatic following of other players. 
* initiate following by reacting to the interact event
* subscribe to remote player and update positions in relation to them
  instead of reacting to user input
* cancel following if the user moves actively again
 2021-12-15 18:36:12 +01:00
PizZaKatZe
f65491e709 Remove unused import 2021-12-15 18:36:11 +01:00
David Négrier
e2afb6ec02
Merge pull request #1626 from workadventure-xce/fix/mapProperties 
Display link to map in map credits if provided in map properties
 2021-12-15 17:12:34 +01:00
Hanusiak Piotr
99ffb7b450 merged develop 2021-12-15 15:23:21 +01:00
David Négrier
2fff6ae41e Improving code security by adding stricter typings 2021-12-14 18:55:58 +01:00
David Négrier
7ec8cd2a5b Fixing CI 2021-12-14 16:16:42 +01:00
David Négrier
ea7fc62c00 Merge branch 'feature-picture-of-user' into feature-picture-of-user-merge 2021-12-14 16:06:35 +01:00
David Négrier
8efeab97c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-picture-of-user-merge 2021-12-14 15:50:24 +01:00
David Négrier
0a705eadf9
Merge pull request #1616 from Waclaw-I/feature-camera-zone-focus 
Focusable zones
 2021-12-14 15:43:45 +01:00
David Négrier
0e68490e75 Refactoring with a MapStore 
A great deal of the complexity of the current code is that we must chain
2 reactive values (one in the map "GameScene.MapPlayersByKey" and one in
the snapshot store).

The new generic MapStore class can be used to listen to stores inside a map.
When the store inside the map, or the map itself is modified, the
resulting store is updated.
 2021-12-14 14:47:25 +01:00
Hanusiak Piotr
960c247b20 added documentation for Focusable Zones 2021-12-14 12:03:05 +01:00
Hanusiak Piotr
0f1378c069 PR fixes 2021-12-14 10:28:41 +01:00
David Négrier
8a96ff8ee4
Merge pull request #1614 from ValdoTR/user-room-token 
Added the user-room token created from admin when we access a room
 2021-12-13 17:50:49 +01:00
Valdo Romao
592e07bc4f Fixed linter errors 2021-12-13 16:19:47 +00:00
PizZaKatZe
80794975aa Add new layer property audioCopyright 2021-12-11 22:24:28 +01:00
PizZaKatZe
aad582df70 Display map link in map credits if provided 2021-12-11 22:23:54 +01:00
Hanusiak Piotr
bbe539b785 moved gettingSnapshot logic into TexturesHelper 2021-12-10 12:02:14 +01:00
Gregoire Parant
9357afd13f Update warning container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-10 01:54:48 +01:00
Gregoire Parant
a5d4d163e1 Add test mode 
`*` char permit to defined test mode with warning message

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-10 01:51:40 +01:00
David Négrier
598c7412a2 When sending an invalid token, the HTTP API from the Pusher now returns a 401 instead of an HTTP 500. 2021-12-08 14:46:23 +01:00
David Négrier
7a6e250a58 Fixing map caching 
Maps in the GameScene can be modified by the scripting API.
If so, previously, the changes to the maps were persisted in the ITiledMap object in the GameScene because this was cached by the Phaser loader,
causing a series of problems, the most noticeable being that templating in the scripting API stopped working on a second visit of a page.

We are now deep-copying the map on load to avoid these nasty effects.

Closes https://github.com/workadventure/scripting-api-extra/issues/77
 2021-12-08 14:23:00 +01:00
Hanusiak Piotr
b12fb228af fixed typos 2021-12-08 13:25:54 +01:00
Hanusiak Piotr
4d473480cf enter and leave zone events 2021-12-08 13:18:06 +01:00
Hanusiak Piotr
03cf5c05ff added zoom_margin optional property for zone definition 2021-12-08 13:03:25 +01:00
Hanusiak Piotr
082b33cf02 more subtle zone leaving camera work 2021-12-08 11:31:49 +01:00
David Négrier
ff77a18262 Don't retry Axios if a token decryption failed 
If a token decryption failed, it will emit a HTTP 500.

We should not retry Axios in this case but rather fail.

Note: a token decryption failed should not throw a HTTP 500 but another error code (HTTP 401?)
So maybe this fix is plainly wrong.
 2021-12-08 11:16:39 +01:00
Bénédicte Q
e60ed68cd0
Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-12-08 10:14:31 +01:00
Bénédicte Q
8a6ad40d6b
Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-12-08 10:06:34 +01:00
Hanusiak Piotr
957ba8f8c7 more subtle start follow player by camera. wip 2021-12-07 17:03:51 +01:00
Hanusiak Piotr
8eaacdf2e5 companion pictures store 2021-12-07 16:37:24 +01:00
Hanusiak Piotr
5efa17651c show woka-icon with camera on 2021-12-07 16:07:58 +01:00
David Négrier
1d2d60a67a Fixing issue with "instance" part of the URL lost in exitSceneUrl URLs. 2021-12-07 15:55:36 +01:00
Hanusiak Piotr
cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
Hanusiak Piotr
731f616cce woka icon inside menu 2021-12-07 14:56:42 +01:00
Hanusiak Piotr
b36f39d3d9 revert menu icon to its original view 2021-12-07 14:01:30 +01:00
Hanusiak Piotr
e62ad6b9c9 merged develop 2021-12-07 13:56:28 +01:00
Hanusiak Piotr
e97fd1d38c Merge branch 'develop' into feature-camera-zone-focus 2021-12-07 13:20:15 +01:00
Hanusiak Piotr
29ccb52c93 cleanup 2021-12-07 13:18:36 +01:00
Hanusiak Piotr
b00d24dbf7 refocusing on target (if any) in case of an external resize 2021-12-07 12:48:08 +01:00
David Négrier
2f8bd52dba
Merge pull request #1628 from workadventure-xce/feat/force-cowebsite-triggers 
New setting: Always ask before opening cowebsites / Jitsi meetings
 2021-12-07 10:42:33 +01:00
David Négrier
d68da0754e
Merge pull request #1472 from thecodingmachine/type_module 
Switching API to use type="module" scripts
 2021-12-07 09:23:58 +01:00
PizZaKatZe
d49d44d7ea New setting: Always ask before opening cowebsites / Jitsi meetings 2021-12-06 23:25:25 +01:00
PizZaKatZe
a71fc40b5d Fix volume slider UI updates 2021-12-06 21:54:33 +01:00
Benedicte Quimbert
4b4f5520db Corrects scale managing and camera event listening 2021-12-06 18:44:37 +01:00
David Négrier
84f7a8c383 Pretty fix 2021-12-06 18:20:06 +01:00
David Négrier
c27662c315 Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests 2021-12-06 18:07:47 +01:00
David Négrier
d7875c2c68 Adding missing handler for error message in front + removing 2 useless classes in ServerToClientMessage 2021-12-06 18:00:17 +01:00
Alexis Faizeau
c95e20c677 Lint & Prettier fixes on Svelte files 2021-12-06 16:36:05 +01:00
David Négrier
44c4b4fc34 Fixing error handling of fonts when there is no connection to front 2021-12-06 15:14:38 +01:00
David Négrier
492fd2ed4e Adding retried URL in retry error logs 2021-12-04 18:30:12 +01:00
David Négrier
2cfc504e9a Adding a retry on /anonymLogin 2021-12-04 18:18:43 +01:00
Hanusiak Piotr
4bc21a95c5 ran prettier 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
a1a83775d6 issues with zone triggering fixed 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
37949eda53 working with zoom modifier calculating per zone 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ddaa81a7ac some more tweaks with smooth zooming control 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
092daa245f locking zooming via player input 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ef3a7513e2 camera zoom using scaleManager zooming. WIP 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
8016cf3c1a fallback in case of CanvasRenderer 2021-12-04 16:29:28 +01:00
Hanusiak Piotr
c33e78d1ee ran prettier 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
a62cfe1cd8 fallback if avatar could not be loaded 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ed8d6855b1 fixed bug with woka picture snapshot taking current frame and not front 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ecb334cbd2 fixed Woka picture positioning 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
642d3bb301 Changed the way WOKA's are stored 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
2ea54fd243 use Prettier to fix style issues 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
913a07350d little cleanup, added reject for Character snapshot 2021-12-04 15:36:11 +01:00