Commit Graph

266 Commits

Author SHA1 Message Date
_Bastler
70888e6baf Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-04-25 14:50:09 +02:00
Piotr 'pwh' Hanusiak
23092c75d6 merged develop 2022-04-19 12:43:56 +02:00
David Négrier
b89997c9f1 Changes the prefix added in front of the jitsiRoomName
Previously, the prefix was computed using the org/world (in SAAS) or the instance part of public URLs.
Neither was guaranteeing the Jitsi Room would be unique accross rooms.
The new system computes a hash of the room URL and prepends it to the jitsi room name.

BREAKING CHANGE: this means the URL of the Jitsi room will change for all maps. Users having bookmarked the Jitsi room (for instance in the Jitsi mobile app) will need to update their bookmarks.
2022-04-19 08:52:26 +02:00
Alban Bruder
0f08e3d1b5 Compute instance in pusher /map endpoint 2022-04-19 08:52:26 +02:00
Piotr 'pwh' Hanusiak
99854e2d62 removed silent message 2022-04-14 11:41:01 +02:00
Piotr 'pwh' Hanusiak
8f0b02a9c8 change away to availability status 2022-04-14 11:03:58 +02:00
grégoire parant
a13c7e9e2f
Improve profile menu to implement user identity connected URL (#2055)
#  Improve profile menu to implement user identity connected URL

- Create URL and get user identity
- Check if user is connected or show connexion button
- Improve profile to check before user data and don't display error webpage in menu
2022-04-14 10:17:59 +02:00
_Bastler
bceb5ba74d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-04-13 16:42:40 +02:00
_Bastler
12bc22236f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-04-13 15:35:28 +02:00
Alexis Faizeau
a3fd891530 Fix linting errors 2022-04-13 15:32:25 +02:00
David Négrier
6920836e47 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2022-04-13 15:12:06 +02:00
David Négrier
952a5bd87c Making a round of improvement to log messages
Also, bootstraping a new LocalAdmin service to mock the AdminApi in the pusher
2022-04-13 15:07:03 +02:00
CEC
e13fec1a8b Fix Map Controller SafeParse -> Parse 2022-04-13 14:43:54 +02:00
Alexis Faizeau
d1e8243c47
Zod EVERYWHERE (#2027)
* Zod EVERYWHERE

* Add no-unused-vars rule to eslint in front

* Add no-unused-vars rule to eslint in pusher

* Add no-unused-vars rule to eslint in back

* Remove unused PlayerTexture guards

* Fix data providing on room connection

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2022-04-12 14:21:19 +02:00
Piotr Hanusiak
02f06a913b
Availability indicator (#2044)
* status indicators changing properly

* away status wip

* updating away status on connection

* remove obsolete logs

* fix typecheck

* minor adjustments

* darker outline

* Trying darker outline

* Apply suggestions from code review

* Update pusher/src/Model/Zone.ts

* Making the dot smaller

* Marking onleavezone as deprecated

Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-04-07 14:23:53 +02:00
_Bastler
6c3c3f8d44 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-04-04 16:25:33 +02:00
David Négrier
9647f93cc2
Merge pull request #1994 from thecodingmachine/new_custom_woka_scene
New custom woka scene
2022-04-04 14:45:44 +02:00
Piotr Hanusiak
7e84ac5454
Global voice-indicators (#2020)
* make use of well known types for PlayerDetailsUpdated message

* show voice-chat indicator of people from other groups too

* cleanup

* check for outline value

* do not send outline color if undefined

* revert removing LocalVolumeStore

* use auto-generated type instead

Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
2022-04-04 13:47:23 +02:00
grégoire parant
003bc86262
Release 1.9.6 (#2021)
* Change accès token with query privateAccessToken in the url

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Add play uri param

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* PlayUri parameter

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* removed unused imports

* send group userIds to players

* sending info about group lock state. wip

* listening to lockGroupMessage on front

* cleanup

* Updating GroupDescriptors on LockGroupMessage

* remove console logs

* group circles with color fill

* fix GameRoom text

* remove obsolete check

* cr fixes #1 wip

* much cleaner approach to group lock update

* fix compilation error

* well-known values wip

* Removing old unused images

Just a bit of cleanup!

* update with dan suggest

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change roomId by playUri

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* hide voice indicator for player leaving still existing bubble conversation

* Refactor access by token

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Refactor connexion manager

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Adds settings options and localUser functions

* PrivacyShutdownStore modifies constraints according to the user's setting

* switches dropdown for checkboxes and adjusts wording

* Adds the todo about German translation

* Adds test map

* Makes the default setting: camera off and mic on

* Add z-index on embeds screens and action menu

* Fixes tileset import

* Adds settings options and localUser functions

* PrivacyShutdownStore modifies constraints according to the user's setting

* switches dropdown for checkboxes and adjusts wording

* Adds the todo about German translation

* Adds test map

* Makes the default setting: camera off and mic on

* Fixes tileset import

* Applying German translation, thanks to @Lurkars

* removed obsolete console.log

* fix linter issues

* make use of proto well knows types

* fixed types for RoomConnection

* fix locking bubble when returning from away mode

* Fix run pretty

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* prevent actions menu from appearing when inserting space key on chat

* Bump ansi-regex from 4.1.0 to 4.1.1 in /maps

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /desktop/local-app

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump ansi-regex from 4.1.0 to 4.1.1 in /desktop/electron

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump ansi-regex from 4.1.0 to 4.1.1 in /uploader

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump plist from 3.0.4 to 3.0.5 in /desktop/electron

Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/TooTallNate/node-plist/releases)
- [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md)
- [Commits](https://github.com/TooTallNate/node-plist/commits)

---
updated-dependencies:
- dependency-name: plist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
Co-authored-by: Benedicte Quimbert <b.quimbert@workadventu.re>
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Bénédicte Q <37311765+HimeShaman@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-30 11:13:27 +02:00
Piotr 'pwh' Hanusiak
21e84064b9 Merge branch 'develop' into new_custom_woka_scene 2022-03-29 15:52:16 +02:00
_Bastler
7f4677e640 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-29 15:38:41 +02:00
David Négrier
c177173688
Merge pull request #2005 from thecodingmachine/proto-well-known-types
make use of proto well knows types
2022-03-29 14:40:53 +02:00
Gregoire Parant
c1222c1c57 Fix run pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-29 13:45:31 +02:00
Gregoire Parant
dce1ece837 Merge branch 'develop' into changeRegisterAccess
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	front/vite.config.ts
2022-03-29 13:30:40 +02:00
_Bastler
437b11545a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-28 17:49:25 +02:00
Piotr 'pwh' Hanusiak
82dffff5a7 make use of proto well knows types 2022-03-28 17:08:12 +02:00
Piotr 'pwh' Hanusiak
b95d5f1d10 merged develop 2022-03-28 13:16:29 +02:00
Piotr 'pwh' Hanusiak
f656702bb9 merged develop 2022-03-24 14:56:42 +01:00
_Bastler
92af014e0f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-22 08:37:18 +01:00
David Négrier
705c75e3c7 Adding wokalist type checking on front
Additionally, we are making superLoad.json accept a new "immediateCallback" parameter that resolves during the event handler (and not after)
2022-03-21 11:29:18 +01:00
Gregoire Parant
e618dc6c3d Refactor connexion manager
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-20 14:33:25 +01:00
David Négrier
c529658ef4 Adding first version of SuperLoader
This class is the Phaser loader as it should be: it comes with promises,
can be easily run out of the "preload" phase and won't crash if the
scene is destroyed before textures are loaded.
2022-03-18 18:11:32 +01:00
Gregoire Parant
56fb73c682 Change roomId by playUri
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-17 10:53:56 +01:00
Gregoire Parant
5448596f01 Merge branch 'develop' into changeRegisterAccess
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	pusher/src/Services/AdminApi.ts
2022-03-17 09:54:24 +01:00
David Négrier
53b184e82b Adding support for custom logos
The admin can now set custom logos for the login scene and for the loading screen.
2022-03-15 18:16:56 +01:00
_Bastler
9eec503215 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-14 10:33:34 +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
David Négrier
6f4c3a89cd Improving openapi doc 2022-03-14 09:57:56 +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
Alexis Faizeau
36646cbdbe Add returns on pusher endpoints 2022-03-11 16:26:45 +01:00
Piotr Hanusiak
2a73400f7c
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>
2022-03-11 14:30:00 +01:00
David Négrier
4ebb25e6ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas 2022-03-11 11:55:30 +01:00
David Négrier
f97681cef5 Actually returning something in logout-callback 2022-03-11 10:44:40 +01:00
Hanusiak Piotr
5a8cba24fa much cleaner approach to group lock update 2022-03-10 12:20:53 +01:00
Hanusiak Piotr
3760b9c4ad add options for /register 2022-03-08 15:52:48 +01:00
Hanusiak Piotr
5706e5c416 remove console logs 2022-03-03 12:31:17 +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