Commit graph

1983 commits

Author SHA1 Message Date
Ludwig Behm 0cd0f5acc0
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2022-02-04 00:41:26 +01:00
Ludwig Behm 2c1b5a90ea
front: remove instance name from jitsi room names if global 2022-02-04 00:35:53 +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
Alexis Faizeau 1b93bf666f Remove translate from warning message 2022-02-03 14:38:53 +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
tabascoeye ddbda8f267 Remove all weapons from the character select 2022-02-03 02:10:53 +01:00
¯\_(ツ)_/¯ e368067462 Characters, clothes and accessories from rc3 2022-02-03 02:02:45 +01:00
tabascoeye ebd4bae452 Add companions from rC3
Thanks to TabascoEye, MikeTango, deinkoks and possibly others. :-)
2022-02-03 02:02:23 +01:00
PizZaKatZe 5b233a6c48 Set default game FPS to 20 2022-02-02 23:49:41 +01:00
PizZaKatZe 185d3b58ed Pusher federation
Source: https://gist.github.com/jstsmthrgk/2c82124c9ac2bd453658f52c90b8dd44
2022-02-02 22:48:19 +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 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
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
Hanusiak Piotr 27b7bb0dca removed unnecessary wake event unregistering 2022-02-01 12:55:29 +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