Commit Graph

2708 Commits

Author SHA1 Message Date
_Bastler 9c4e4f08f8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-15 14:14:11 +01:00
David Négrier b959ce7a6d Migrating some promises to Deferred objects to simplify the code. 2022-03-15 13:51:36 +01:00
David Négrier 153bffd521 Wait for main character to be loaded to display the GameScene
This change makes sure the character of the current player is fully loaded before we display the game scene.
Otherwise, you could have a glitch for 0.5-2 seconds between the GameScene being displayed and the actual character being displayed.
2022-03-15 13:51:36 +01:00
David Négrier 3988559d2a Removing old unused images
Just a bit of cleanup!
2022-03-15 13:51:10 +01:00
David Négrier b6b6c7f15f Adding error case when texture is empty 2022-03-14 14:28:42 +01:00
David Négrier 52b5027702 Adding source maps to production build. 2022-03-14 13:55:30 +01:00
David Négrier 352f144e97 Merge pull request #1963 from thecodingmachine/develop
Deploy 2022-03-14
2022-03-14 13:01: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 366231df98 textures on auth 2022-03-13 09:27:35 +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
Hanusiak Piotr 5a8cba24fa much cleaner approach to group lock update 2022-03-10 12:20:53 +01:00
_Bastler 4e6a622546 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-09 20:29:52 +01:00
Hanusiak Piotr 3a5aa3c3c5 cr fixes #1 wip 2022-03-09 16:51:11 +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 0d4091c431 unused import 2022-03-08 15:20:00 +01:00
_Bastler 633d56fc67 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-08 15:17:37 +01:00
Lukas 7b26d16868 lazy load EmoteMenu (#1938) 2022-03-08 11:56:34 +01:00
Lukas 2938aba484 Multi-platform images (#1924)
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
2022-03-08 11:21:17 +01:00
_Bastler bc33d88726 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-07 19:06:17 +01:00
David Négrier 07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
Hanusiak Piotr 3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Anton Bracke 4535a8ae96 Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr 363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
_Bastler e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
_Bastler 6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
_Bastler ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Hanusiak Piotr 724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Lurkars 0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler 946a4d75e9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 09:20:50 +01:00
Lurkars c3b3d5e9d6 Fix nginx.conf to work with OIDC (#1932)
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
2022-02-28 09:07:38 +01:00
_Bastler 8bc66723d5 fix nginx.conf 2022-02-27 14:52:57 +01:00
_Bastler c12582c329 fix nginx.conf 2022-02-27 14:52:13 +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 86dc0d4aa8 add DOMPurify 2022-02-27 14:37:26 +01:00
_Bastler 9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler 2622041740 orig. formatting 2022-02-27 13:59:05 +01:00
_Bastler 03ee2eb49a update dockerfile 2022-02-26 11:27:47 +01:00
_Bastler 36a4b140ba rename images 2022-02-26 11:19:48 +01:00
_Bastler 0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
Lukas f1cba60825 base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas 3f3af9b957 improve docker build caching
install dependencies before copying source into image
2022-02-25 18:53:14 +01:00
_Bastler 7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00