Commit Graph

199 Commits

Author SHA1 Message Date
_Bastler
9eec503215 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-14 10:33:34 +01:00
Piotr Hanusiak
d4dcd0d5ce
Actions menu api (#1862)
* wip

* wip

* random action on click

* removing actions

* register single key per command use

* change removeActionsMenu action name

* fixed actions menu not hiding content properly:

* actions menu fix

* added mock Block Player action

* ActionsMenu buttons styling

* added displaying priority for menu actions

* moved utils actionMenu features to the UI

* import as a type:

* more object oriented style for API

* removed registered actions from RemotePlayer instance

* readme update

* Fixing typos / Improving wording

* added instructions on AlterActionsMenu test map

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-03-14 10:15:10 +01:00
_Bastler
0e1ba49a3e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-13 09:25:25 +01:00
David Négrier
6540f15c5b
Refactoring Woka management (#1810)
* Wrap websockets with HyperExpress

* Add endpoints on pusher to resolve wokas

* getting textures urls from pusher

* Adding OpenAPI documentation for the pusher.

The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.

* revert FRONT_URL

* playerTextures metadata is being loaded via Phaser.Loader

* fetch textures every time character or customize scene is open

* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

* Sending character layer details to admin

* Cleaning commented code

* Fixing regex

* Fix woka endpoints on pusher

* Change error wording on pusher

* Working on integration of the woka-list with the new admin endpoint.

* Switching from "name" to "id" in texture object + using zod for woka/list validation

* Add position on default woka data

* Remove async on pusher option method

* Fix woka list url

* add options for /register

* Fxiing loading the Woka list

* Actually returning something in logout-callback

* Copying messages to back too

* remove customize button if no body parts are available (#1952)

* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>

* Add returns on pusher endpoints

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
2022-03-11 17:02:58 +01:00
_Bastler
ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +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
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
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
b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
_Bastler
9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +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
Hanusiak Piotr
e34a72c865 merged develop 2022-02-07 15:09:18 +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
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
Hanusiak Piotr
d087bc02e9 TalkIcon animation 2022-02-03 16:00:29 +01:00
_Bastler
f21f51c006 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 12:39:32 +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
_Bastler
301eaba90e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 16:42:18 +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
Hanusiak Piotr
0eaeaf7cfb Merge branch 'develop' into feature-options-menu 2022-02-02 09:31:10 +01:00
_Bastler
468adf4f64 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 16:07:09 +01:00
Alexis Faizeau
1124ed5a5e Implement cancelable woka resource 2022-02-01 15:17:04 +01:00
Hanusiak Piotr
520184fdeb add talk-icon 2022-02-01 12:25:14 +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
Hanusiak Piotr
099d573296 cleanup 2022-01-27 16:50:25 +01:00
Hanusiak Piotr
68c4a5f5ce different approach 2022-01-27 14:05:30 +01:00
Hanusiak Piotr
2781b72799 wip with handling outlines for activitable objects 2022-01-26 17:14:22 +01:00
Hanusiak Piotr
dbd06bda4e changing the way Outline is handled 2022-01-26 14:59:23 +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
Hanusiak Piotr
5ae039b987 little cleanup 2022-01-26 10:54:51 +01:00
Hanusiak Piotr
06d403ebe3 simplify actionsMenu 2022-01-26 10:40:13 +01:00
_Bastler
f2da041b7c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-25 21:09:48 +01:00
Hanusiak Piotr
58227a39f8 destroy actionsMenu on RemotePlayer destroy() 2022-01-25 17:13:52 +01:00
Hanusiak Piotr
88f3032298 do not move player if clicked on Player or RemotePlayer. Close actionsMenu on second click 2022-01-25 15:47:21 +01:00
Hanusiak Piotr
67627637aa added store with actions for actionsMenu 2022-01-25 13:42:41 +01:00
Hanusiak Piotr
69a2379e53 Merge branch 'develop' into feature-options-menu 2022-01-25 10:33:30 +01:00
Alexis Faizeau
4829964127 Display correctly the username on Brave browser 2022-01-24 16:55:58 +01:00
Hanusiak Piotr
fd012d6c69 ActionsMenu WIP 2022-01-24 16:27:57 +01:00