Commit graph

3283 commits

Author SHA1 Message Date
PizZaKatZe 0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
PizZaKatZe d6ef60a3d8 Send request to group members only 2021-12-15 18:41:37 +01:00
PizZaKatZe 1fca99c0d1 Send follow me request to all players 2021-12-15 18:41:36 +01:00
PizZaKatZe b30d0989c8 Fix indentation in messages.proto 2021-12-15 18:36:12 +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 e3cb6d73ca
Merge pull request #1649 from ValdoTR/fix/test-skins
Added some skins to test the woka related code
2021-12-15 17:43:35 +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
Valdo Romao be0c70f9ac Added some skins to test the woka related code 2021-12-15 11:11:37 +00:00
David Négrier 94dcf54675
Merge pull request #1648 from thecodingmachine/feature-picture-of-user-merge
User's WOKA used in UI (3)
2021-12-14 16:36:06 +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 08eab8dedb
Merge pull request #1647 from thecodingmachine/feature-picture-of-user-merge
User's WOKA used in UI (2)
2021-12-14 16:05:01 +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
Piotr Hanusiak e4b1055e36
Merge pull request #1 from thecodingmachine/feature-picture-of-user-refactor
Refactoring with a MapStore
2021-12-14 15:18:51 +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 d523eee5bd Fixed pusher lint error 2021-12-13 16:22:59 +00:00
Valdo Romao 592e07bc4f Fixed linter errors 2021-12-13 16:19:47 +00:00
Valdo Romao dbbfdfb66b Updated API doc 2021-12-13 16:08:44 +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
David Négrier 27aa3c51d3
Merge pull request #1642 from thecodingmachine/add_link_awesome
Adding links to awesome-workadventure
2021-12-09 18:11:29 +01:00
David Négrier ac2a7e3672 Adding a reference to awesome-workadventure in README 2021-12-09 18:10:30 +01:00
David Négrier 525ca16968 Adding a reference to awesome-workadventure in CONTRIBUTING 2021-12-09 18:08:04 +01:00
David Négrier 1b982588e4
Merge pull request #1641 from thecodingmachine/doc_contrib_scripting
Developer documentation regarding scripting API
2021-12-09 12:17:18 +01:00
David Négrier bef81edb84
Merge pull request #1639 from tabascoeye/develop
adding map properties to documentation
2021-12-09 12:17:02 +01:00
David Négrier d7d77dd7d6 Developer documentation regarding scripting API
This PR adds a first developer documentation regarding how to extend the scripting API.
2021-12-09 12:13:16 +01:00
TabascoEye 0cb17c7fd1
adding map properties to documentation
* screenshot of the result of the map properties
* first try at documenting map properties
2021-12-08 16:41:22 +01:00
David Négrier 15bdb0eb56
Merge pull request #1636 from thecodingmachine/no_retry_on_token_decrypted_error
Don't retry Axios if a token decryption failed
2021-12-08 15:32:43 +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
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
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
Hanusiak Piotr cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
David Négrier 1e6ce4dec8 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-07 14:59:17 +01:00
Hanusiak Piotr 731f616cce woka icon inside menu 2021-12-07 14:56:42 +01:00
David Négrier 7b94f8b8ca
Merge pull request #1612 from thecodingmachine/fix-admin-sockets
Creating only one WS connection to pusher from admin
2021-12-07 14:56:13 +01:00