Gregoire Parant
|
658781e02e
|
Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/public/resources/logos/meet.svg
|
2022-02-22 23:40:48 +01:00 |
|
Gregoire Parant
|
0943ec8991
|
Define color text by brightness
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-21 01:09:53 +01:00 |
|
Gregoire Parant
|
23f7d6f08f
|
Update CoWebsite Jitsi
- Change Jitsi meeting icon
- Add Jitsi meeting information
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-20 23:28:27 +01:00 |
|
Lukas Hass
|
3ee9b26650
|
use optional chaining
|
2022-02-19 20:25:17 +01:00 |
|
Lukas Hass
|
2755489ccf
|
Merge branch 'develop' into vite
|
2022-02-17 15:20:58 +01:00 |
|
Alexis Faizeau
|
f186111d2f
|
Fix importing coWesbite from API to store
|
2022-02-17 09:51:32 +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
|
3875d3b0f5
|
Merge branch 'develop' into avoid-exits-on-path
|
2022-02-16 14:03:48 +01:00 |
|
Lukas Hass
|
cdc3d182bc
|
fix comparison that is always false
|
2022-02-15 12:00:32 +01:00 |
|
Lukas Hass
|
8c96a986fb
|
remove webpack reference
|
2022-02-15 11:07:04 +01:00 |
|
Lukas Hass
|
ae8c18fa4b
|
prevent reading property 'collides' of undefined
fixes e2e tests
|
2022-02-14 22:07:15 +01:00 |
|
Lukas Hass
|
ae46a1faf1
|
Merge branch 'develop' into vite
|
2022-02-14 19:47:27 +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 |
|
Hanusiak Piotr
|
639c456540
|
use png instead of svg for talk icon
|
2022-02-14 10:37:13 +01:00 |
|
Lukas Hass
|
29cdb1a8e5
|
Merge branch 'develop' into vite
|
2022-02-13 11:46:26 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Hanusiak Piotr
|
9cfebecde2
|
parallaxx and parallaxy made optional
|
2022-02-08 13:32:02 +01:00 |
|
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 |
|
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 |
|
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 |
|