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

2899 Commits

Author SHA1 Message Date
Lukas
2938aba484
Multi-platform images (#1924) 
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
 2022-03-08 11:21:17 +01:00
_Bastler
bc33d88726 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-07 19:06:17 +01:00
David Négrier
07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
Alexis Faizeau
9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
Hanusiak Piotr
3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Anton Bracke
4535a8ae96
Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr
363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr
a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr
a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr
ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr
d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
_Bastler
e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
_Bastler
6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
_Bastler
ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Hanusiak Piotr
724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler
946a4d75e9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 09:20:50 +01:00
Lurkars
c3b3d5e9d6
Fix nginx.conf to work with OIDC (#1932) 
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
 2022-02-28 09:07:38 +01:00
_Bastler
8bc66723d5 fix nginx.conf 2022-02-27 14:52:57 +01:00
_Bastler
c12582c329 fix nginx.conf 2022-02-27 14:52:13 +01:00
_Bastler
51719660d9 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-27 14:39:42 +01:00
_Bastler
86dc0d4aa8 add DOMPurify 2022-02-27 14:37:26 +01:00
_Bastler
9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler
2622041740 orig. formatting 2022-02-27 13:59:05 +01:00
_Bastler
03ee2eb49a update dockerfile 2022-02-26 11:27:47 +01:00
_Bastler
36a4b140ba rename images 2022-02-26 11:19:48 +01:00
_Bastler
0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
Lukas
f1cba60825
base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas
3f3af9b957
improve docker build caching 
install dependencies before copying source into image
 2022-02-25 18:53:14 +01:00
David Négrier
08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +01:00
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier
3a9ce7615d
Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1 
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
 2022-02-25 14:10:21 +01:00
David Négrier
da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +01:00
David Négrier
378a95962a Heavy changes: refactoring the pusher to always send the textures (and the front to accept them) 2022-02-23 21:13:11 +01:00
Hanusiak Piotr
d65fe0ee26 fetch textures every time character or customize scene is open 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
063de6d1ca playerTextures metadata is being loaded via Phaser.Loader 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
52e15eccfa revert FRONT_URL 2022-02-23 19:53:54 +01:00
Hanusiak Piotr
80761804a7 getting textures urls from pusher 2022-02-23 19:53:54 +01:00
Alexis Faizeau
2161a40e05 Add endpoints on pusher to resolve wokas 2022-02-23 19:53:54 +01:00
_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
8d8857011e removed unused imports 2022-02-23 14:40:19 +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
Gregoire Parant
3541f153fa Push Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-22 23:37:28 +01:00
Anton Bracke
4e243151dd
add desktop api to front 2022-02-22 16:57:56 +01:00
dependabot[bot]
3aef82303c
Bump ansi-regex from 5.0.0 to 5.0.1 in /front 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-21 16:27:29 +00: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
ddf62107f2 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:55:41 +01:00
_Bastler
90a69b0704 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-20 13:55:11 +01:00
_Bastler
667e3c0944 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:28:29 +01:00
_Bastler
f7167537c3 fix dockerfile 2022-02-20 13:28:10 +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
dependabot[bot]
707b78b506
Bump url-parse from 1.5.3 to 1.5.7 in /front 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-17 14:52:03 +00: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
779f5c1fdb
Merge branch 'develop' into vite 2022-02-14 22:11:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined 
fixes e2e tests
 2022-02-14 22:07:15 +01:00
David Négrier
8c8fdb9ee0
Merge pull request #1858 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.8 
Bump follow-redirects from 1.14.7 to 1.14.8 in /front
 2022-02-14 22:04:22 +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
Hanusiak Piotr
6f41622263 unignoring resources directory 2022-02-14 16:26:50 +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
dependabot[bot]
c6b125b347
Bump follow-redirects from 1.14.7 to 1.14.8 in /front 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-13 09:55:59 +00: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
Anton Bracke
948a674bb2
use correct file 2022-02-11 16:17:17 +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
a91f022fd2 Making typesafe-i18n watch by default 2022-02-11 15:47:57 +01:00
Anton Bracke
3dbd83ac47
load nes.css from npm 2022-02-11 15:47:17 +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
Gregoire Parant
cfbf9dca23 PlayUri parameter 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-08 20:31:08 +01:00
Gregoire Parant
64ba7575a0 Add play uri param 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-08 18:47:11 +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
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
31f3b2b48e
Merge pull request #1834 from thecodingmachine/stabilize-cowebsite 
Remove priority on iframe add to cowebsites
 2022-02-07 18:42:52 +01:00
Alexis Faizeau
7334d59c4f Remove priority on iframe add to cowebsites 2022-02-07 18:41:24 +01:00
David Négrier
3953b78cfe
Merge pull request #1823 from lukashass/fix-vscode-prettier 
Remove explicit definition of prettier-plugin-svelte
 2022-02-07 18:39:32 +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
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
_Bastler
77cbc078ea Merge pull request #1824 from thecodingmachine/fix-focus-iframe 2022-02-04 15:08:09 +01:00
_Bastler
104f792444 remove warning 2022-02-04 15:05:58 +01:00
_Bastler
9054174c40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-04 15:04:36 +01:00
Alexis Faizeau
6863fa3764 Fix game unfocusable after clicking on iframe 2022-02-04 14:46:57 +01:00
Lukas Hass
de5a505296
remove explicit definition of prettier-plugin-svelte 
fixes prettier in vscode
 2022-02-03 19:26:25 +01:00
_Bastler
86ac7372a7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 19:20:53 +01:00
Lukas Hass
f8d0a91776
add generic to pass undefined type 2022-02-03 18:47:51 +01:00
Lukas Hass
b6b7d1e66c
tsconfig exclude build artifacts 2022-02-03 18:45:26 +01:00
Lukas Hass
e4ca1e97fc
remove webpack tsconfig 2022-02-03 18:42:02 +01:00
Lukas Hass
faf6be889e
add typecheck script 2022-02-03 18:41:13 +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
_Bastler
f21f51c006 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 12:39:32 +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
_Bastler
b0faec0459 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 11:08:03 +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
Lukas Hass
bd72022b13
remove webpack 2022-02-03 02:23:58 +01:00
Lukas Hass
f2af7c6e95
fix cowebsite container display when scss is not yet loaded 2022-02-03 02:17:28 +01:00
Lukas Hass
7f9d318074
update sass 2022-02-03 02:14:49 +01:00
_Bastler
9a17af1a74 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 19:18:03 +01:00
Hanusiak Piotr
4b7278b843 add brackets to the condition 2022-02-02 16:42:38 +01:00
_Bastler
301eaba90e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 16:42:18 +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
_Bastler
f7b92f843e merge dev 2022-02-02 10:21:24 +01:00
_Bastler
ffe0f53907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-02 10:21:13 +01:00
Hanusiak Piotr
0eaeaf7cfb Merge branch 'develop' into feature-options-menu 2022-02-02 09:31:10 +01:00
Lukas Hass
984c1e4502
add vite config to build iframe api 2022-02-02 00:20:46 +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
_Bastler
468adf4f64 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 16:07:09 +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
7fbd4c85cb
build iframe-api-typings with tsc 2022-02-01 11:22:33 +01:00
Lukas Hass
b1d9e603b8
fix redirect when map url is present 2022-02-01 11:15:52 +01:00
_Bastler
0e84293720 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 07:58:11 +01:00
Lukas Hass
2d8fa591cf
migrate build script to vite 2022-02-01 01:46:05 +01:00
Lukas Hass
f87704b2ef
remove redundant font loading 
see fd70d89061/README.md (custom)
 2022-02-01 01:29:38 +01:00
Lukas Hass
4ad91f41a3
update svelte and svelte-preprocess 2022-02-01 00:37:49 +01:00
Lukas Hass
bd8623cbf9
allow mixed value and type imports 2022-02-01 00:36:05 +01:00
Lukas Hass
73c7785ac3
add polyfill for simple-peer node builtins 2022-02-01 00:35:16 +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
b1e9969ed8
fix vite client connection in docker 2022-01-31 18:35:16 +01:00
Lukas Hass
3d6b8b6063
run vite in docker 2022-01-31 17:36:38 +01:00
Lukas Hass
d84a7536ca
add sveltePreprocess 2022-01-31 17:34:36 +01:00
Lukas Hass
ca2875c801
fix fontsource import 2022-01-31 17:32:45 +01:00
Lukas Hass
2f032c5acd
and entrypoint to index.html 2022-01-31 17:32:30 +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
Lukas Hass
b83fc77183
use vite plugin for env-config generation 2022-01-31 16:56:50 +01:00
Lukas Hass
5091e8d649
add vite and svelte plugin 2022-01-31 16:20:17 +01:00
Lukas Hass
585a398b14
move index.html to . 2022-01-31 16:18:51 +01:00
Lukas Hass
d98acf9d2a
gitignore dist/ completely 2022-01-31 16:16:43 +01:00
Lukas Hass
590e16ff8a
move all static assets to public/ 2022-01-31 16:14:34 +01:00
Nolway
541aa78a1f Define max height on streamable 2022-01-31 14:29:01 +01:00
_Bastler
6cea6a3ce0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-31 13:57:46 +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
965725dd71 Remove border radius on video elements 2022-01-31 11:58:12 +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
_Bastler
ab470ab18d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-29 14:36:47 +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
_Bastler
54f936860b Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-28 08:01:54 +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
949b73d900 Fix style 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-27 20:33:33 +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
_Bastler
6783598244 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-27 19:08:57 +01:00
dependabot[bot]
1572ddc477
Bump nanoid from 3.1.30 to 3.2.0 in /front 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-27 15:50:53 +00: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
78e816c6fb Removing optimization in dev to get back normal compilation times in watch mode 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
5f1dd09cb9 Implement minimizer for css/scss 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
Alexis Faizeau
d7121d4192 Add fonts & png files built to the gitignore file 2022-01-27 16:33:11 +01:00
_Bastler
8c1b55f5db i18n trigger message 2022-01-27 15:53:53 +01:00
David Négrier
d18e9162b9 Generating i18n files before build 2022-01-27 15:51:23 +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
_Bastler
55bb6fa930 walk on dbl click 2022-01-27 14:58:16 +01:00
_Bastler
08816ae80f walk on dbl click 2022-01-27 14:57:46 +01:00
Hanusiak Piotr
68c4a5f5ce different approach 2022-01-27 14:05:30 +01:00
_Bastler
6c094b714b front dockerfile 2022-01-27 13:32:25 +01:00
_Bastler
6b74dfd442 front dockerfile 2022-01-27 13:27:09 +01:00
_Bastler
7e987ad470 latest dev + i18n 2022-01-27 13:03:59 +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
_Bastler
e3b58a0d56 prettier 2022-01-26 12:44:08 +01:00
Lurkars
2252bc79ff prettier 2022-01-26 12:39:20 +01:00