_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,790 Commits 2 Branches 0 Tags 47 MiB
d0af766394
Commit Graph

2207 Commits

Author SHA1 Message Date
jonnytest1
8cdbf382ad
added columns type definition 2021-12-31 15:55:17 +01:00
PizZaKatZe
bda46be466 Remove left-over debug message 2021-12-31 15:35:21 +01:00
PizZaKatZe
5460bd49be Fix follow requests via keyboard 2021-12-31 15:35:21 +01:00
PizZaKatZe
c55cad6227 Disable user selection of UI elements 2021-12-31 15:27:08 +01:00
Lurkars
e7022e96d7 fix audio player src 2021-12-30 16:48:02 +01:00
Alexis Faizeau
68431c5242
Merge branch 'develop' into master 2021-12-30 13:18:13 +01:00
Alexis Faizeau
b148a46e3c Remove unused policy type from ApiData typeguard 2021-12-30 12:51:52 +01:00
David Négrier
36ce4f8f29
Merge pull request #1664 from Chasethechicken/layers 
Add missing layer properties
 2021-12-24 16:10:15 +01:00
David Négrier
d37165219c Migrating followStates and followRoles from a const object to a type restricted to only the string values allowed. 
This allows for more secure code (compilation checks) and simpler code too (we can pass strings instead of const values)
 2021-12-24 15:49:25 +01:00
David Négrier
840f8626ad Refactoring code to use Svelte native "$" store unpacking. 2021-12-24 15:39:28 +01:00
David Négrier
a1cfaa0225 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-24 15:06:15 +01:00
David Négrier
87bc7f8099 Slightly improving follow request popup design 2021-12-24 14:36:38 +01:00
David Négrier
fefe7c8aa5 Removing the "Ask others to follow you?" popup 
No need to ask twice, the user just pressed the "follow" button.
 2021-12-24 13:48:35 +01:00
Alban Bruder
380328079b
Merge branch 'develop' into feature-admin-message-queue 2021-12-24 12:49:08 +01:00
Alban Bruder
00e0a14a37 Display multiple admin messages 2021-12-24 12:15:54 +01:00
Gregoire Parant
5d729d0560 Fix message Warning Container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-24 12:02:47 +01:00
David Négrier
4a7be94b92 Fixing bug in redirect handling of rooms 2021-12-23 21:36:13 +01:00
David Négrier
524339a3a0 Adding hightlight to player names when they follow each others 2021-12-23 18:07:51 +01:00
David Négrier
368a115b4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-23 16:04:59 +01:00
Gregoire Parant
efa57d2754 Fix pretier 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 15:06:32 +01:00
David Négrier
d54e129fbe Fixing bug in redirect handling of rooms 2021-12-23 14:53:03 +01:00
Gregoire Parant
96d46e96c2 Fix svelte error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 14:52:42 +01:00
Gregoire Parant
df3c618ffa Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
 2021-12-23 14:23:08 +01:00
Gregoire Parant
fd64fc43a4 Finish 2 days room limit 
- Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 13:09:28 +01:00
David Négrier
9efa115982 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-23 11:04:20 +01:00
David Négrier
35463930a0 Sending color outline on connect 2021-12-23 10:22:19 +01:00
Gregoire Parant
60f4cf75c3 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 10:02:46 +01:00
David Négrier
482ba9690a Sharing outline color changes in real time 2021-12-22 18:34:36 +01:00
Chasethechicken
6cae134c8f Fix indentation 
To make prettier happy
 2021-12-22 10:13:26 +01:00
Chasethechicken
1ea7b45c7e Fix misplaced semicolon 2021-12-21 23:26:15 +01:00
David Négrier
90f7287860 Adding the ability to set the player's color outline via the scripting API 
(currently not shared with the other players yet)
 2021-12-21 17:02:53 +01:00
Alban Bruder
85c07e3723 Fix admin message update in frontend 2021-12-21 13:03:24 +01:00
Chasethechicken
6f4fe47808 Add missing layer properties 
Enables map makers to set the alpha, visibility, origin and size of layers.

Co-authored-by: jonny <ga86lad@mytum.de>
 2021-12-21 11:31:14 +01:00
PizZaKatZe
50147db895 Block running in follow mode 2021-12-20 13:36:29 +01:00
PizZaKatZe
21b1313a18 Get rid of buggy open state 2021-12-20 12:50:43 +01:00
Lurkars
3916d9c58e Add follow button to ui, improved flow 2021-12-20 11:35:06 +01:00
Lurkars
2cd088c049 Change follow request to "F" button, use nes-css buttons 2021-12-18 11:58:30 +01:00
Hanusiak Piotr
f8353bd7b5 send camera update event from CameraManager 2021-12-17 11:05:11 +01:00
David Négrier
1ed10b0cdd Adding Prettier in messages 2021-12-16 16:40:50 +01:00
David Négrier
88a6e80a8f Adding JsonMessages to Docker image 2021-12-16 16:09:59 +01:00
David Négrier
b2bcfde5b1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into upgrade_typescript_4.5 2021-12-16 16:07:17 +01:00
David Négrier
0c281db411 More eslint fixes (+ ignoring no-unsafe-argument rule for now) 2021-12-16 15:57:37 +01:00
Hanusiak Piotr
4ebc55a429 subtle changes in CameraManager in order to distinguish between setPosition and focusOn 2021-12-16 14:31:26 +01:00
Hanusiak Piotr
5f26a39a5d added basic WA.camera commands 2021-12-16 13:41:28 +01:00
David Négrier
98d3a58861 Improving typings of VirtualJoystick 2021-12-16 10:04:55 +01:00
David Négrier
fa2e583d48 Reimporting correctly types moved to /messages 2021-12-16 10:04:41 +01:00
PizZaKatZe
a481376633 Clean up remaining debug log messages 2021-12-15 20:11:47 +01:00
PizZaKatZe
d3297a448e Add setting that ignores follow invites 2021-12-15 19:47:14 +01:00
PizZaKatZe
e3e7fba539 Rename InteractMenu/-Store => FollowMenu/-Store 2021-12-15 18:50:59 +01:00
PizZaKatZe
2bd71790b5 Use user IDs instead of names 2021-12-15 18:42:24 +01:00
PizZaKatZe
1ab8165951 Process input events in follow mode as well 2021-12-15 18:42:24 +01:00
PizZaKatZe
290e5131e9 Clean up follow implementation; stop following when leader leaves the scene 2021-12-15 18:42:24 +01:00
PizZaKatZe
7bff782f7f Improve follow abort message; avoid having to change it in backend 2021-12-15 18:42:24 +01:00
PizZaKatZe
0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
PizZaKatZe
1fca99c0d1 Send follow me request to all players 2021-12-15 18:41:36 +01:00
PizZaKatZe
e7f1395809 Stop before running into followed Avatar; stop sprite animation 2021-12-15 18:36:12 +01:00
danb
372dda792f Fix issue of interrupted conversation in follow-mode 2021-12-15 18:36:12 +01:00
danb
7c7144527c Add minimum distance to enable following 2021-12-15 18:36:12 +01:00
danb
f340e8114d Implement automatic following of other players. 
* initiate following by reacting to the interact event
* subscribe to remote player and update positions in relation to them
  instead of reacting to user input
* cancel following if the user moves actively again
 2021-12-15 18:36:12 +01:00
PizZaKatZe
f65491e709 Remove unused import 2021-12-15 18:36:11 +01:00
David Négrier
e2afb6ec02
Merge pull request #1626 from workadventure-xce/fix/mapProperties 
Display link to map in map credits if provided in map properties
 2021-12-15 17:12:34 +01:00
Hanusiak Piotr
99ffb7b450 merged develop 2021-12-15 15:23:21 +01:00
David Négrier
2fff6ae41e Improving code security by adding stricter typings 2021-12-14 18:55:58 +01:00
David Négrier
7ec8cd2a5b Fixing CI 2021-12-14 16:16:42 +01:00
David Négrier
ea7fc62c00 Merge branch 'feature-picture-of-user' into feature-picture-of-user-merge 2021-12-14 16:06:35 +01:00
David Négrier
8efeab97c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-picture-of-user-merge 2021-12-14 15:50:24 +01:00
David Négrier
0a705eadf9
Merge pull request #1616 from Waclaw-I/feature-camera-zone-focus 
Focusable zones
 2021-12-14 15:43:45 +01:00
David Négrier
0e68490e75 Refactoring with a MapStore 
A great deal of the complexity of the current code is that we must chain
2 reactive values (one in the map "GameScene.MapPlayersByKey" and one in
the snapshot store).

The new generic MapStore class can be used to listen to stores inside a map.
When the store inside the map, or the map itself is modified, the
resulting store is updated.
 2021-12-14 14:47:25 +01:00
Hanusiak Piotr
960c247b20 added documentation for Focusable Zones 2021-12-14 12:03:05 +01:00
Hanusiak Piotr
0f1378c069 PR fixes 2021-12-14 10:28:41 +01:00
David Négrier
8a96ff8ee4
Merge pull request #1614 from ValdoTR/user-room-token 
Added the user-room token created from admin when we access a room
 2021-12-13 17:50:49 +01:00
Valdo Romao
592e07bc4f Fixed linter errors 2021-12-13 16:19:47 +00:00
David Négrier
bbef3b3eaf Upgrade Typescript to 4.5 
This commit contains the new Typescript version but NOT the fixes needed to have the project compiling.
 2021-12-13 16:45:16 +01:00
PizZaKatZe
80794975aa Add new layer property audioCopyright 2021-12-11 22:24:28 +01:00
PizZaKatZe
aad582df70 Display map link in map credits if provided 2021-12-11 22:23:54 +01:00
Hanusiak Piotr
bbe539b785 moved gettingSnapshot logic into TexturesHelper 2021-12-10 12:02:14 +01:00
Gregoire Parant
9357afd13f Update warning container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-10 01:54:48 +01:00
Gregoire Parant
a5d4d163e1 Add test mode 
`*` char permit to defined test mode with warning message

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-10 01:51:40 +01:00
David Négrier
598c7412a2 When sending an invalid token, the HTTP API from the Pusher now returns a 401 instead of an HTTP 500. 2021-12-08 14:46:23 +01:00
David Négrier
7a6e250a58 Fixing map caching 
Maps in the GameScene can be modified by the scripting API.
If so, previously, the changes to the maps were persisted in the ITiledMap object in the GameScene because this was cached by the Phaser loader,
causing a series of problems, the most noticeable being that templating in the scripting API stopped working on a second visit of a page.

We are now deep-copying the map on load to avoid these nasty effects.

Closes https://github.com/workadventure/scripting-api-extra/issues/77
 2021-12-08 14:23:00 +01:00
Hanusiak Piotr
b12fb228af fixed typos 2021-12-08 13:25:54 +01:00
Hanusiak Piotr
4d473480cf enter and leave zone events 2021-12-08 13:18:06 +01:00
Hanusiak Piotr
03cf5c05ff added zoom_margin optional property for zone definition 2021-12-08 13:03:25 +01:00
Hanusiak Piotr
082b33cf02 more subtle zone leaving camera work 2021-12-08 11:31:49 +01:00
David Négrier
ff77a18262 Don't retry Axios if a token decryption failed 
If a token decryption failed, it will emit a HTTP 500.

We should not retry Axios in this case but rather fail.

Note: a token decryption failed should not throw a HTTP 500 but another error code (HTTP 401?)
So maybe this fix is plainly wrong.
 2021-12-08 11:16:39 +01:00
Bénédicte Q
e60ed68cd0
Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-12-08 10:14:31 +01:00
Bénédicte Q
8a6ad40d6b
Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-12-08 10:06:34 +01:00
Hanusiak Piotr
957ba8f8c7 more subtle start follow player by camera. wip 2021-12-07 17:03:51 +01:00
Hanusiak Piotr
8eaacdf2e5 companion pictures store 2021-12-07 16:37:24 +01:00
Hanusiak Piotr
5efa17651c show woka-icon with camera on 2021-12-07 16:07:58 +01:00
David Négrier
1d2d60a67a Fixing issue with "instance" part of the URL lost in exitSceneUrl URLs. 2021-12-07 15:55:36 +01:00
Hanusiak Piotr
cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
Hanusiak Piotr
731f616cce woka icon inside menu 2021-12-07 14:56:42 +01:00
Hanusiak Piotr
b36f39d3d9 revert menu icon to its original view 2021-12-07 14:01:30 +01:00
Hanusiak Piotr
e62ad6b9c9 merged develop 2021-12-07 13:56:28 +01:00
Hanusiak Piotr
e97fd1d38c Merge branch 'develop' into feature-camera-zone-focus 2021-12-07 13:20:15 +01:00
Hanusiak Piotr
29ccb52c93 cleanup 2021-12-07 13:18:36 +01:00
Hanusiak Piotr
b00d24dbf7 refocusing on target (if any) in case of an external resize 2021-12-07 12:48:08 +01:00
David Négrier
2f8bd52dba
Merge pull request #1628 from workadventure-xce/feat/force-cowebsite-triggers 
New setting: Always ask before opening cowebsites / Jitsi meetings
 2021-12-07 10:42:33 +01:00
David Négrier
d68da0754e
Merge pull request #1472 from thecodingmachine/type_module 
Switching API to use type="module" scripts
 2021-12-07 09:23:58 +01:00
David Négrier
df700a8740
Merge pull request #1494 from workadventure-xce/fix/volumeSliderUI 
Fix volume slider UI updates
 2021-12-07 09:20:55 +01:00
David Négrier
2495aa1faf
Merge pull request #1615 from thecodingmachine/dependabot/npm_and_yarn/front/joeattardi/emoji-button-4.6.2 
Bump @joeattardi/emoji-button from 4.6.0 to 4.6.2 in /front
 2021-12-07 09:14:10 +01:00
PizZaKatZe
d49d44d7ea New setting: Always ask before opening cowebsites / Jitsi meetings 2021-12-06 23:25:25 +01:00
PizZaKatZe
a71fc40b5d Fix volume slider UI updates 2021-12-06 21:54:33 +01:00
Benedicte Quimbert
4b4f5520db Corrects scale managing and camera event listening 2021-12-06 18:44:37 +01:00
David Négrier
6a8717c22f
Merge pull request #1602 from thecodingmachine/e2e_reconnect_tests 
Adding a reconnect feature in case first Pusher request fails
 2021-12-06 18:44:18 +01:00
David Négrier
84f7a8c383 Pretty fix 2021-12-06 18:20:06 +01:00
Alexis Faizeau
3bb86dfea8 Fix Svelte linting 2021-12-06 18:16:24 +01:00
David Négrier
c27662c315 Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests 2021-12-06 18:07:47 +01:00
David Négrier
d7875c2c68 Adding missing handler for error message in front + removing 2 useless classes in ServerToClientMessage 2021-12-06 18:00:17 +01:00
Alexis Faizeau
c95e20c677 Lint & Prettier fixes on Svelte files 2021-12-06 16:36:05 +01:00
Alexis Faizeau
6cd76b9c1b Add Eslint check & Prettier on Svelte files 2021-12-06 16:10:35 +01:00
David Négrier
44c4b4fc34 Fixing error handling of fonts when there is no connection to front 2021-12-06 15:14:38 +01:00
David Négrier
492fd2ed4e Adding retried URL in retry error logs 2021-12-04 18:30:12 +01:00
David Négrier
2cfc504e9a Adding a retry on /anonymLogin 2021-12-04 18:18:43 +01:00
Hanusiak Piotr
4bc21a95c5 ran prettier 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
a1a83775d6 issues with zone triggering fixed 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
37949eda53 working with zoom modifier calculating per zone 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ddaa81a7ac some more tweaks with smooth zooming control 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
092daa245f locking zooming via player input 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ef3a7513e2 camera zoom using scaleManager zooming. WIP 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
8016cf3c1a fallback in case of CanvasRenderer 2021-12-04 16:29:28 +01:00
Hanusiak Piotr
c33e78d1ee ran prettier 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
a62cfe1cd8 fallback if avatar could not be loaded 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ed8d6855b1 fixed bug with woka picture snapshot taking current frame and not front 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ecb334cbd2 fixed Woka picture positioning 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
642d3bb301 Changed the way WOKA's are stored 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
2ea54fd243 use Prettier to fix style issues 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
913a07350d little cleanup, added reject for Character snapshot 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
dcd8e57853 images are blurred no more 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
7b94ac644d working woka picture if no camera view is provided 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
f4ce82481e avatar as a menu button 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
b8eeb3c8ab saving players avatar textures to the texturesManager 2021-12-04 15:36:11 +01:00
David Négrier
411ee251ff Improving URL displaying of failed Axios request 2021-12-03 22:02:19 +01:00
David Négrier
487b8317e7 Adding stacktrace to error message in console 2021-12-03 21:58:08 +01:00
David Négrier
ebcfc069bc More details in the error 2021-12-03 21:45:25 +01:00
David Négrier
8b21ba5383 Improving Axios error logging 2021-12-03 20:55:46 +01:00
David Négrier
f90bd85ded Improving error reporting and adding Video reports 2021-12-03 19:54:34 +01:00
David Négrier
c89afba6cd Working on more tests 2021-12-03 15:21:31 +01:00
David Négrier
78ee4009c8 Improving tests, WIP 2021-12-03 09:28:30 +01:00
David Négrier
9bba6069b4 Making LIVE_RELOAD configurable 2021-12-03 09:23:52 +01:00
dependabot[bot]
6be57a2b3c
Bump @joeattardi/emoji-button from 4.6.0 to 4.6.2 in /front 
Bumps [@joeattardi/emoji-button](https://github.com/joeattardi/emoji-button) from 4.6.0 to 4.6.2.
- [Release notes](https://github.com/joeattardi/emoji-button/releases)
- [Commits](https://github.com/joeattardi/emoji-button/compare/v4.6.0...v4.6.2)

---
updated-dependencies:
- dependency-name: "@joeattardi/emoji-button"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-01 18:29:39 +00:00
Valdo Romao
dd79f7d0f4 Added the user-room token created from admin when we access a room 2021-12-01 15:50:14 +00:00
David Négrier
fcf0888864 Adding a reconnect feature in case first Pusher request fails 
Now, if the first pusher request fails, a waiting message will be displayed and the application will reconnect when the pusher comes back alive or the network connection is established again.
 2021-12-01 14:14:02 +01:00
Gregoire Parant
b098b5f37d Fixing "Query string parameters prevent WA from loading" 
Due to a regression, query string parameters added to the URL (like:

http://play.workadventure.localhost/_/global/maps.workadventure.localhost/starter/map.json?utm_source=sendinblue&utm_campaign=WA+-+2021+Christmap+map+launch&utm_medium=email#foo

) were causing a crash in WA.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-30 17:29:53 +01:00
David Négrier
d81ecb3199 Making the ADMIN_URL parameter optionnal in front 
This parameter is only used in the SAAS version (and ideally, should disappear completely).
The warning message that uses the ADMIN_URL should originate from the admin itself.
 2021-11-30 14:58:37 +01:00
David Négrier
06483fd586 Fixing "Query string parameters prevent WA from loading" 
Due to a regression, query string parameters added to the URL (like:

http://play.workadventure.localhost/_/global/maps.workadventure.localhost/starter/map.json?utm_source=sendinblue&utm_campaign=WA+-+2021+Christmap+map+launch&utm_medium=email#foo

) were causing a crash in WA.

This commit fixes the issue (and adds a E2E test)
 2021-11-30 14:34:43 +01:00
Alexis Faizeau
812485f863 Cannot rezise main cowebsite when fullscreen is enable 2021-11-29 18:35:32 +01:00
Benedicte Quimbert
7eda8a45a7 Reverts adding scale to the camera updated event and uses it directly from the website manager 2021-11-26 14:46:02 +01:00
Benedicte Quimbert
f761858328 Refactoring and documentation update 2021-11-25 10:56:43 +01:00
Benedicte Quimbert
5b6a8ca4d7 Adds the camera to available APIs with retrieving of the worldView 2021-11-25 10:56:42 +01:00
Benedicte Quimbert
99dfd77600 WIP API updates for tutorial and more 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
353577b1d7 Fixes deleting SharedVariablesManager's close() function 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
926fcf9d63 Cleans forgotten useless commentaries 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
a22c2a09b8 Uses the current player position rather than the starting one to position iframe 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
bf69b55e99 Creates player state and uses it to get and set values from local storage 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
89cd292527 Allows to read and write "Player properties" from LocalStorage 2021-11-25 10:55:54 +01:00
Alexis Faizeau
a775a01d2a Resize cowebsites when main slot is loaded 2021-11-25 10:48:14 +01:00
grégoire parant
5bdb5d98a9
Merge pull request #1589 from thecodingmachine/fix-grab-cowebsite 
Handle touch & mouse events on same time for cowebsite holder
 2021-11-24 19:44:07 +01:00
Gregoire Parant
060c844468 Fix htag in localstorage 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-24 19:24:43 +01:00
Alexis Faizeau
07c01d81bf Handle touch & mouse events on same time for cowebsite holder 2021-11-24 18:38:39 +01:00
David Négrier
94959e2e91 Merge branch 'develop' of github.com:thecodingmachine/workadventure into HotFixCleanTokenParamUrl 
# Conflicts:
#	back/src/Services/Logger.ts
 2021-11-24 17:03:29 +01:00
David Négrier
257162c451 Fixing prettier 2021-11-24 17:02:11 +01:00
David Négrier
6e6cdc7bde
Revert "Improving log messages" 2021-11-24 16:20:07 +01:00
David Négrier
6c5f330b71
Merge pull request #1584 from thecodingmachine/fixes 
Fixes
 2021-11-24 15:55:33 +01:00
Gregoire Parant
b02c09fc7b Clean token auth of url params 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-24 15:49:45 +01:00
Alexis Faizeau
5c3036e18b Display a default skin on remote player entity 2021-11-24 15:43:01 +01:00
David Négrier
07ba532c5e Prettier fixes on front 2021-11-24 15:31:17 +01:00
David Négrier
9b29fde1b3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into pretty_ci_front_fix 2021-11-24 15:30:29 +01:00
David Négrier
dc58f16418
Merge pull request #1582 from thecodingmachine/end-to-end-tests 
Making the loader resizable
 2021-11-24 15:30:15 +01:00
David Négrier
2cbf5b56af Fixing linting 2021-11-24 15:29:12 +01:00
David Négrier
7c6105d93a Making the loader resizable 
This way, if the window is resized while loading, the loading bar will stay in the middle
 2021-11-24 15:21:07 +01:00
Alexis Faizeau
24640d13bb Fix removing of co-website action trigger 2021-11-24 14:50:19 +01:00
David Négrier
2f632ae472
Merge pull request #1580 from thecodingmachine/fix-tab 
Fix tab index on embedded iframes
 2021-11-24 12:17:25 +01:00
Alexis Faizeau
6a7385947d Fix authentication mandatory 2021-11-24 11:55:28 +01:00
Alexis Faizeau
4ca763c028 Fix tab index on embbed iframes 2021-11-24 11:05:18 +01:00
David Négrier
550ffaf8a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into end-to-end-tests 
# Conflicts:
#	front/src/Administration/AnalyticsClient.ts
 2021-11-24 11:01:50 +01:00
David Négrier
806b97afab Refactoring Analytics to remove errors 2021-11-24 10:21:19 +01:00
David Négrier
a82f4e1813 Adding end-to-end tests 
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
 2021-11-23 15:43:34 +01:00
Gregoire Parant
ecc6321e17 Add new action post hog 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-18 11:39:56 +01:00
Alexis Faizeau
44c99fb0ef Fix zoom from cowebsite changes 2021-11-17 15:26:58 +01:00
Gregoire Parant
e5979998c5 Update design of credit page 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:28:54 +01:00
Gregoire Parant
0614fa7b47 HotFix copy link to share it 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:03:54 +01:00
Gregoire Parant
e54732be1b HotFix authentication manager to get data from back 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 14:46:32 +01:00
Gregoire Parant
ba89d9b122 HotFix DISABLED_ROOM for env variable 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 13:18:40 +01:00
Gregoire Parant
8768374460 HotFix connexion manager 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 13:14:40 +01:00
Gregoire Parant
ec1cc92c8b replace console log by error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 11:23:18 +01:00
Gregoire Parant
c1dc438138 HotFix encrypted and decrypted error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 11:14:27 +01:00
Gregoire Parant
d3964ae25b HotFix conflict merging 2021-11-15 16:36:10 +01:00
David Négrier
4e042389c5 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 
# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	pusher/src/Controller/AuthenticateController.ts
#	pusher/src/Controller/IoSocketController.ts
#	pusher/src/Services/JWTTokenManager.ts
 2021-11-15 16:30:45 +01:00
Gregoire Parant
210a789aa4 Fix feedback @moufmouf 2021-11-15 15:58:08 +01:00
Gregoire Parant
bbc2ac2550 Update Connection manager to clean url history of navigator 2021-11-15 15:25:49 +01:00
Gregoire Parant
15cdc54ec3 Add evnvironment Enum for OPID_LOGIN_SCREEN_PROVIDER variable 2021-11-12 19:36:37 +01:00
Gregoire Parant
f905426ebd Add new variable login provider to connect user 2021-11-12 19:36:13 +01:00
Gregoire Parant
24a1f324c7 Add OpenId login url and provider to login user 2021-11-12 19:35:34 +01:00
Gregoire Parant
ca74f92051 Pull open id admin from @GRP 2021-11-12 16:59:34 +01:00
Gregoire Parant
fa233e13c6 Changes ANONYMOUS variable 
This variable will be use to mandatory login user in self hosted
 2021-11-12 16:43:37 +01:00
Gregoire Parant
461dee776c Update css 2021-11-12 16:22:37 +01:00
Gregoire Parant
49f68451ae Update profile menu and change UX 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 15:31:49 +01:00
Gregoire Parant
d3f120f2bb Update to have token when user is connected 
- Update menu design

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 12:13:44 +01:00
Gregoire Parant
1db22d82af Set state in local storage when openid provider redirect on jwt with token value 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-10 18:26:50 +01:00
David Négrier
ee4ec7ba97
Merge pull request #1555 from thecodingmachine/iconserver 
Add iconserver in services
 2021-11-10 18:12:47 +01:00
Alexis Faizeau
624593e425 Implement twemoji on emote 2021-11-10 16:55:20 +01:00
Alexis Faizeau
1c48feeb61 Add iconserver in services 2021-11-10 16:46:13 +01:00
Gregoire Parant
7406b62093 Add jwt token if is defined un URL 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-09 00:38:32 +01:00
Gregoire Parant
89baafba2f Rollback openid connect to use code and nonce 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-09 00:08:01 +01:00
Alexis Faizeau
5a3d510f05 Create GameMapProperties index 2021-11-02 10:52:25 +01:00
Alexis Faizeau
dbd6ce5bdc Fix player movement tests 2021-10-29 23:30:02 +02:00
Alexis Faizeau
d4470568ec Fix change layer api functions 2021-10-29 23:16:36 +02:00
Alexis Faizeau
f4df12e5ff Cowebsite properties manage by layer and not by property index 2021-10-29 19:45:03 +02:00
Alexis Faizeau
934e24f837 Implement on enter/leave layer events 2021-10-29 19:44:58 +02:00
David Négrier
60a82c5eb2
Merge pull request #1516 from thecodingmachine/iframeManager 
Display multi co-websites
 2021-10-29 15:33:56 +02:00
Alexis Faizeau
e216b6caf4 Handle landscape mobile with cowebsite 2021-10-29 15:23:09 +02:00
Alexis Faizeau
68c626088d Add co-website icon on mobile landscape 2021-10-28 11:31:28 +02:00
Gregoire Parant
6c0d8942e5 HotFix set last room for first connexion 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 16:48:33 +02:00
Gregoire Parant
f8ae189cee HotFix handler message in chat store 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 14:29:39 +02:00
Gregoire Parant
385ea1360e Type Chat message Store 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 10:02:47 +02:00
Alexis Faizeau
ab1a9b358a Change favicon snatcher http to https 2021-10-26 14:16:00 +02:00
Alexis Faizeau
fb7fe0dc0a Rename cowebsite API functions 2021-10-25 19:00:26 +02:00
Alexis Faizeau
fbff7491df Zoom x 2 thumbnail cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
f84c4b3276 Refacto insert cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
b81b1ff68b Implement new cowbesite system on API 2021-10-25 19:00:26 +02:00
Alexis Faizeau
c29c4bfaa4 Fix onChatMessage subscriber 2021-10-25 19:00:26 +02:00
Alexis Faizeau
da8cc661b7 Implement the new co website system 2021-10-25 19:00:26 +02:00
Alexis Faizeau
1ee0b28f66 Fix co website closing on exit zone 2021-10-25 19:00:26 +02:00
David Négrier
1efcbb4529
Merge pull request #1521 from thecodingmachine/change-player-depth 
Change character depth to 0
 2021-10-25 15:11:09 +02:00
David Négrier
b6d571500e
Merge pull request #1528 from thecodingmachine/api_chat_multiple_virtual_users 
When there are many virtual users (generated by chat), only the name of a first user is displayed.
 2021-10-18 15:02:21 +02:00
David Négrier
4a40c08578 Fixing chat message attributed to wrong user 
When a new user entered a chat message, the message was still attributed to the last user who wrote.
 2021-10-18 14:58:29 +02:00
David Négrier
4abf7208ff
Merge pull request #1524 from thecodingmachine/player-direction 
Display the real sprite direction on character loaded
 2021-10-18 14:37:01 +02:00
Alexis Faizeau
c13839ce8d Display the real sprite direction on character loaded 2021-10-15 16:35:42 +02:00
David Négrier
958fc9eee8
Merge pull request #1523 from thecodingmachine/fix_back_forth_localhost 
Fixing exit problem on localhost maps
 2021-10-15 16:27:32 +02:00
David Négrier
70d5c7f658 Triggering onload even if file already loaded for files loaded via http:// 2021-10-15 16:14:17 +02:00
grégoire parant
79e83d3782
Merge pull request #1522 from thecodingmachine/HotFixContactPage 
Fix share link for website
 2021-10-15 15:44:44 +02:00
Gregoire Parant
a8d6024352 Fix share link for website 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-15 15:25:23 +02:00
David Négrier
79a5916057 Removing dead code 2021-10-15 15:08:06 +02:00
Gregoire Parant
497a7c3467 Fix typo emails => email 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:33:53 +02:00
Alexis Faizeau
cdf4023928 Change character depth to 0 2021-10-14 17:32:27 +02:00
Gregoire Parant
b7692dd355 Fix local user useless 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:25:36 +02:00
Gregoire Parant
f87422187f HotFix user data connection 
Create local store for user connected in SSO

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:22:43 +02:00
Kharhamel
726f52976d FEATURE: analytics client now scrape user email and room group 2021-10-11 16:30:01 +02:00
Kharhamel
57bfc1001f FIX: edited changelog 2021-10-11 11:34:10 +02:00
Kharhamel
59fa68e063 FIX: updated posthog client version and fixed a bug with its toolbar 2021-10-08 11:55:27 +02:00
Kharhamel
60eefbce94
Merge pull request #1508 from thecodingmachine/fixSilentZones 
FIX: being in a silent zone new forces mediaConstraints to false
 2021-10-07 14:50:40 +02:00
Kharhamel
9dd3e8ff85 FIX: being in a silent zone new forces mediaConstraints to false 2021-10-06 17:59:20 +02:00
grégoire parant
900c53f499
Update icon message and profile (#1504) 
- Add new icon profil pixel
 - Add new icon message pixel
 - Migrate message icon in svelt menu

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-06 15:36:42 +02:00
grégoire parant
358d9a79d3
Add condition Hash for start layer (#1506) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 23:34:18 +02:00
grégoire parant
908b78fdda
HotFix mandatory login with ADMIN openid connexion (#1503) 
Before anonymous connexion, we must get the details of the map and permit to check mandatory connexion and redirect user to login page.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 18:59:26 +02:00
grégoire parant
b33e271d2e
Merge pull request #1499 from thecodingmachine/develop 
Release 1.5.3
 2021-10-04 20:54:13 +02:00
Kharhamel
02108ce977 FIX: fixes for the emnote menu 2021-10-04 14:43:19 +02:00
Kharhamel
7bb0175648
FIX: we now make sure to completly disable the old stream before attempting to create a new one (#1493) 
* FIX: we now make sure to completly disable the old stream before attempting to create a new one

* FIX: disable audio optimization on chrome

* always reemit the stream on chrome

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Push fix microphone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-02 23:58:33 +02:00
Alexis Faizeau
8c3b708981
Remove audio manager range volume control by keys (#1489) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2021-10-02 15:55:54 +02:00
grégoire parant
1e69bb0f49
Manage redirect URL from admin and save in hydra via pusher (#1492) 
Add redirect parameter url to connect user directly on private openId application

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-30 11:16:25 +02:00
David Négrier
2b5211d098
Merge pull request #1486 from thecodingmachine/fix-links 
Fixing links in the documentation
 2021-09-27 15:41:23 +02:00
David Négrier
b8996d5abb Fixing links in the documentation 2021-09-27 11:13:35 +02:00
Kharhamel
ce26294250 FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer 2021-09-24 11:54:19 +02:00
Kharhamel
bf0c333266
Merge pull request #1463 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /front
 2021-09-23 18:36:51 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401) 
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 20:24:53 +02:00
Kharhamel
8b099e5725 FIX: added another catch case for default model 2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design (#1475) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-20 22:42:15 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
dependabot[bot]
8ecef9eadc
Bump axios from 0.21.1 to 0.21.2 in /front 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:07 +00:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte 
Twemoji emote menu svelte (upgrade of #1301)
 2021-09-20 14:33:16 +02:00
David Négrier
0ecabd14f1 Switching API to use type="module" scripts 
This allows using imports inside scripts imported by WorkAdventure out of the box (and therefore easily importing the scripting-api-extra without resorting to using a bundler)
 2021-09-20 09:14:14 +02:00
grégoire parant
8c96b514d4
HotFix to test hydra connexion (#1471) 2021-09-18 11:35:29 +02:00
Lurkars
63c4eeb4c7 Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:20:42 +02:00
Lurkars
7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
grégoire parant
553902e52a
Add log for Oauth login connexion (#1468) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-16 17:57:14 +02:00
Kharhamel
483191c521
Merge pull request #1458 from thecodingmachine/posthog 
FEATURE: added posthog as new analytics tool
 2021-09-16 15:24:27 +02:00
Kharhamel
2e111aa13a FEATURE: added posthog as new analytics tool 2021-09-16 15:16:10 +02:00
David Négrier
801ec3bf4c Turn off audio on exit 
If an exit zone is overlapping an audio zone, when exiting, the audio is stopped.
We do this by actually triggering the fact that a user should "leave" all active zones when exiting.
 2021-09-15 15:28:55 +02:00
David Négrier
8a6419a3b7
Merge pull request #1457 from thecodingmachine/fix_yarn_not_working 
fix yarn install not working
 2021-09-15 11:50:50 +02:00
David Négrier
bb8583872b Fixing messages generation in Front container 2021-09-15 11:32:32 +02:00
David Négrier
0c374aba48
Merge pull request #1456 from thecodingmachine/jitsi-silent 
Fixing silent zone not respected when exiting Jitsi
 2021-09-15 11:27:50 +02:00
David Négrier
d26325d8dc Fixing silent zone not respected when exiting Jitsi 
Now, when a silent zone is adjacent to a Jitsi, it is enforced, even after leaving the Jitsi zone
 2021-09-15 11:16:23 +02:00
TabascoEye
5a855fb7e4
fix yarn install not working 
problem for virtually all people trying self-hosting according to #1433, #738 and likely more
 2021-09-15 10:43:01 +02:00
GRL78
680e538fd6
save button in settings close menu (#1451) 2021-09-14 16:43:00 +02:00
David Négrier
9006283c90
Merge pull request #1452 from Lurkars/audioPlayerImprovements 
some fixes on the audio player controls
 2021-09-14 14:41:40 +02:00
Lurkars
8c780f07c6 fix font 2021-09-14 11:41:51 +02:00
Lurkars
f1bd92fa52 use included twemoji mozilla font instead of loading external 2021-09-14 11:39:36 +02:00
GRL
ff3e844b68 chat scroll to bottom when it open 2021-09-14 09:36:49 +02:00
Lurkars
34d81b0e6c fix behaviour 2021-09-14 08:55:15 +02:00
Lurkars
91bc524e06 disable controls 2021-09-14 08:50:43 +02:00
Lurkars
beed50874b fix emotemenu on open jitsi rooms 2021-09-13 19:16:47 +02:00
David Négrier
f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
David Négrier
f0b83663f6 Fixing broken sound controls 
Because of the rework of the menu, the clickable zone for the menu was extending at the complete top of the screen, which caused interactive items at the top of the screen (like sound controls) to be broken.

This commit fixes this.
 2021-09-13 10:06:08 +02:00
Lurkars
59c22c8dfc svelte check fix 2021-09-12 11:29:53 +02:00
Lurkars
e5b3088b5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-12 11:22:46 +02:00
Lurkars
3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
TabascoEye
94517c0f4b
add the possibilities of "onaction" and message to new "openTab" property 2021-09-10 23:17:04 +02:00
Lurkars
e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Kharhamel
d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
Lurkars
d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
Lurkars
36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
Gregoire Parant
3a3e5d5f3b Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
 2021-09-08 18:20:13 +02:00
GRL78
2ea7b0cff1
Menu style will adapt if iframe in map is opened (#1422) 2021-09-08 15:43:46 +02:00
grégoire parant
6cf86ec8dc
Add play uri for login and register in hydra (#1421) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-08 13:39:46 +02:00
kharhamel
fa9929757d FIX: reimplemented the old stream behavior on bad navigators like chrome 2021-09-07 16:39:44 +02:00
grégoire parant
f60678478b
Update right css (#1416) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-07 13:59:08 +02:00