Commit Graph

1979 Commits

Author SHA1 Message Date
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
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
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
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