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

1831 Commits

Author SHA1 Message Date
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
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
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
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
84f7a8c383 Pretty fix 2021-12-06 18:20:06 +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
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
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
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