Commit Graph

1421 Commits

Author SHA1 Message Date
_Bastler
990a246228 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-19 20:57:58 +01:00
Piotr 'pwh' Hanusiak
a10f327f45 hide voice indicator for player leaving still existing bubble conversation 2022-03-18 17:46:28 +01:00
_Bastler
9c4e4f08f8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-15 14:14:11 +01:00
David Négrier
3988559d2a Removing old unused images
Just a bit of cleanup!
2022-03-15 13:51:10 +01:00
_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
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list (#1961)
* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-03-14 10:14:35 +01:00
_Bastler
df094d30a2 fix woka-list 2022-03-13 15:49:21 +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
4e6a622546 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-09 20:29:52 +01:00
Piotr Hanusiak
0196eae055
async call for recalculating tiles costs (#1890)
* async call for recalculating tiles costs

* fixed setWalkingCostGrid still being a blocking process

* set exits tiles cost from the start

* removed typing error from code

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
2022-03-08 16:28:54 +01:00
_Bastler
51719660d9 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-27 14:39:42 +01:00
_Bastler
9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
_Bastler
ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +01:00
_Bastler
021a2511e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 16:59:15 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +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
667e3c0944 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:28:29 +01:00
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
_Bastler
7701e44715 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-19 10:15:56 +01:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +01:00
_Bastler
b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
David Négrier
a7264954ea
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator
Feature voice chat indicator
2022-02-16 16:46:13 +01:00
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
_Bastler
dca2cc3c6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 09:16:54 +01:00
Lukas Hass
cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +01:00
Lukas Hass
8c96a986fb
remove webpack reference 2022-02-15 11:07:04 +01:00
_Bastler
9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
_Bastler
d63a32e94e Co-Wesbite 2022-02-15 08:13:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined
fixes e2e tests
2022-02-14 22:07:15 +01:00
Lukas Hass
ae46a1faf1
Merge branch 'develop' into vite 2022-02-14 19:47:27 +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
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
_Bastler
fe2ed33d5f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-12 13:36:30 +01:00
David Négrier
e85f94998f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-voice-chat-indicator 2022-02-11 18:40:03 +01:00
David Négrier
0b82df0d41 Merge branch 'develop' of github.com:thecodingmachine/workadventure into move-to-improvements 2022-02-11 16:58:40 +01:00
David Négrier
80bfeb823e
Merge pull request #1852 from thecodingmachine/stabilize-cowebsite
Stabilize cowebsite
2022-02-11 16:05:19 +01:00
Alexis Faizeau
b0c0d22f25 Translate game map properties trigger messages 2022-02-10 17:30:03 +01:00
Hanusiak Piotr
65fb15704e calculate cost for exit tiles 2022-02-10 17:15:33 +01:00
Alexis Faizeau
460d67534a Move all game scene game map properties listeners 2022-02-10 17:02:10 +01:00
Hanusiak Piotr
66375e6d53 merged develop 2022-02-10 16:00:56 +01:00