_Bastler
|
ac4f16ad03
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 17:07:14 +01:00 |
|
_Bastler
|
021a2511e0
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 16:59:15 +01:00 |
|
Hanusiak Piotr
|
9fe4782fbd
|
clear hashParams after moving player with moveTo param
|
2022-02-23 10:14:09 +01:00 |
|
Gregoire Parant
|
07d399403b
|
Refactor how to use new Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-23 00:27:07 +01:00 |
|
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 |
|
Anton Bracke
|
4e243151dd
|
add desktop api to front
|
2022-02-22 16:57:56 +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
|
070ad6b993
|
Add jiti logo for Jitsi button meeting
|
2022-02-20 23:38:20 +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 |
|
_Bastler
|
667e3c0944
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-20 13:28:29 +01:00 |
|
Lukas Hass
|
3ee9b26650
|
use optional chaining
|
2022-02-19 20:25:17 +01:00 |
|
Lukas Hass
|
e8d5335bc0
|
Merge branch 'develop' into vite
|
2022-02-19 20:08:50 +01:00 |
|
_Bastler
|
7701e44715
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-19 10:15:56 +01:00 |
|
Lukas Hass
|
cc24fd48d5
|
update generic-type-guard and @geprog/vite-plugin-env-config
allows to get rid of node built-in polyfills
|
2022-02-19 00:13:25 +01:00 |
|
Gregoire Parant
|
e4f9f89a40
|
Fix pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:57:11 +01:00 |
|
Gregoire Parant
|
26f5416b63
|
Fix svelt check
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:44:17 +01:00 |
|
Gregoire Parant
|
3a734cc2ae
|
Enable limitation freemium
- Fix warning message
- Fix post message API pusher
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:33:23 +01:00 |
|
_Bastler
|
136269170d
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-18 09:56:05 +01:00 |
|
Lukas Hass
|
2755489ccf
|
Merge branch 'develop' into vite
|
2022-02-17 15:20:58 +01:00 |
|
Lukas Hass
|
c163107875
|
import browserified version of simple-peer
|
2022-02-17 15:02:48 +01:00 |
|
Hanusiak Piotr
|
ecd4b5907a
|
disable corner cutting
|
2022-02-17 12:44:57 +01:00 |
|
Alexis Faizeau
|
f186111d2f
|
Fix importing coWesbite from API to store
|
2022-02-17 09:51:32 +01:00 |
|
_Bastler
|
b1728b7b8c
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-16 20:25:12 +01:00 |
|
Gregoire Parant
|
f0c7e4ea8a
|
Update css warning message & add message button
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-16 20:15:16 +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 |
|
Lurkars
|
2816946c94
|
add OIDC username + locale
|
2022-02-16 09:11:08 +01:00 |
|
Lukas Hass
|
620e218612
|
remove iframe.html
|
2022-02-15 20:19:45 +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 |
|
Lukas Hass
|
8c96a986fb
|
remove webpack reference
|
2022-02-15 11:07:04 +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 |
|
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
|
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 |
|
Lukas Hass
|
29cdb1a8e5
|
Merge branch 'develop' into vite
|
2022-02-13 11:46:26 +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 |
|
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 |
|
_Bastler
|
88e20290bd
|
fix svelte world
|
2022-02-08 11:20:51 +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 |
|
_Bastler
|
a2e50dcd95
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-07 19:56:57 +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 |
|
_Bastler
|
8a8abd2961
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-07 14:40:09 +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 |
|