Commit Graph

2271 Commits

Author SHA1 Message Date
_Bastler 136269170d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-18 09:56:05 +01:00
Hanusiak Piotr ecd4b5907a disable corner cutting 2022-02-17 12:44:57 +01:00
_Bastler b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
David Négrier eae6c2c5e3 Merge pull request #1887 from thecodingmachine/master
Backporting cowebsites hot-fixes
2022-02-16 18:03:23 +01:00
David Négrier a7264954ea Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator
Feature voice chat indicator
2022-02-16 16:46:13 +01:00
Hanusiak Piotr e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr 0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
Hanusiak Piotr dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr 3c54e38401 unlock diagonal movement 2022-02-16 14:28:35 +01:00
Hanusiak Piotr 3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
_Bastler dca2cc3c6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 09:16:54 +01:00
Alexis Faizeau 06dd2202f6 Fix hidden main cowebsite swape 2022-02-15 17:28:15 +01:00
Alexis Faizeau a52ad233d8 Fix cowebsite swap 2022-02-15 17:28:02 +01:00
Alexis Faizeau 0f16d909e7 The second opened cowebsite must be displayed on highlighted 2022-02-15 17:27:32 +01:00
Lukas Hass cdc3d182bc fix comparison that is always false 2022-02-15 12:00:32 +01:00
_Bastler 9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
_Bastler d63a32e94e Co-Wesbite 2022-02-15 08:13:53 +01:00
David Négrier 7a44f3dcb8 Merge pull request #1853 from anbraten/remove-external-deps
Bundle nes.css and quill-js
2022-02-14 18:46:19 +01:00
David Négrier 9bfce8412a Adding a missing translation for "Visiting card"
Also, changing "Visiting Card" to "Business Card" in English
2022-02-14 16:00:53 +01:00
_Bastler 5451fc788d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-14 12:57:46 +01:00
Hanusiak Piotr 639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Anton Bracke aef64afdb9 fix quill import 2022-02-13 20:20:38 +01:00
Lurkars 7da4fd7da6 merge latest translations 2022-02-12 14:37:25 +01:00
_Bastler fe2ed33d5f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-12 13:36:30 +01:00
David Négrier e85f94998f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-voice-chat-indicator 2022-02-11 18:40:03 +01:00
David Négrier 0b82df0d41 Merge branch 'develop' of github.com:thecodingmachine/workadventure into move-to-improvements 2022-02-11 16:58:40 +01:00
David Négrier 80bfeb823e Merge pull request #1852 from thecodingmachine/stabilize-cowebsite
Stabilize cowebsite
2022-02-11 16:05:19 +01:00
Anton Bracke 51f7ce10e1 remove extenal quill import 2022-02-11 15:53:52 +01:00
David Négrier 62f8a131a9 Adding translation for "Walk automatically to my position" 2022-02-11 15:52:24 +01:00
David Négrier 664cce87b8 Improving rendering of share screen 2022-02-11 15:37:23 +01:00
Alexis Faizeau 5137190558 Change cowebsite closing animation 2022-02-11 15:06:41 +01:00
Alexis Faizeau b7f4c0eecc Fix bad type base i18n translations 2022-02-10 19:30:41 +01:00
Alexis Faizeau a5e0c2a9cf Add main cowebsite minimize indicator 2022-02-10 19:30:41 +01:00
Alexis Faizeau b0c0d22f25 Translate game map properties trigger messages 2022-02-10 17:30:03 +01:00
Hanusiak Piotr 65fb15704e calculate cost for exit tiles 2022-02-10 17:15:33 +01:00
Alexis Faizeau 460d67534a Move all game scene game map properties listeners 2022-02-10 17:02:10 +01:00
Hanusiak Piotr 66375e6d53 merged develop 2022-02-10 16:00:56 +01:00
_Bastler da81a712b9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 15:55:36 +01:00
Alexis Faizeau aa9b5e37c7 Merge pull request #1850 from thecodingmachine/stabilize-cowebsite
Fix Jitsi co-website reloading
2022-02-10 15:50:59 +01:00
Alexis Faizeau 666b6df588 Fix Jitsi co-website reloading 2022-02-10 15:37:04 +01:00
_Bastler 9f6158728a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 14:02:31 +01:00
David Négrier b851dd1f52 Merge pull request #1838 from thecodingmachine/stabilize-cowebsite
Fix cowebsite closing on fast opening/closing
2022-02-10 12:16:04 +01:00
Alexis Faizeau 7b6a3949bc Move CoWebsite to generic class 2022-02-10 11:47:56 +01:00
_Bastler 71431165d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 08:35:25 +01:00
Hanusiak Piotr c58eeb8a0f Merge branch 'develop' into feature-voice-chat-indicator 2022-02-09 14:02:44 +01:00
Hanusiak Piotr c13672c9dc updated invitation link creator 2022-02-09 13:03:14 +01:00
Hanusiak Piotr b565080312 parse x and y position from moveTo param 2022-02-09 10:52:44 +01:00
Hanusiak Piotr fe570c9117 moveTo object position 2022-02-09 10:17:31 +01:00
Hanusiak Piotr 20267d3483 Merge branch 'develop' into fix-issue-1835 2022-02-09 09:35:43 +01:00
Hanusiak Piotr b32a2970e4 collisionGrid now updates on showing / hiding layers 2022-02-08 15:46:41 +01:00