Commit Graph

2294 Commits

Author SHA1 Message Date
CEC
f1a93fea88 Merge branch 'develop' of github.com:thecodingmachine/workadventure into codeAPI 2022-04-20 16:26:08 +02:00
CEC
5a416d265e Merge branch 'localAdmin' into codeAPI 2022-04-20 15:37:02 +02:00
Bénédicte Q
59d3a38921
Reworking the wording of "away" mode (#2053)
* Initial commit

* Styles

* Prettier fixx

* fixes path

* Adjusts size

Co-authored-by: Benedicte Quimbert <b.quimbert@workadventu.re>
2022-04-20 15:05:56 +02:00
Piotr 'pwh' Hanusiak
2a7b09be15 change state even for jitsi on trigger 2022-04-20 13:18:12 +02:00
CEC
4076decacc fix prettier issue 2022-04-20 11:30:14 +02:00
CEC
8d771d8442 Add redirect directly without showing ErrorScreen 2022-04-20 10:54:27 +02:00
Alban Bruder
576a2b89cc
Use NES.css to style share link (#2104)
* Use NES.css to style share link

* Run pretty

Co-authored-by: Alban Bruder <alban.bruder@uni-weimar.de>
2022-04-20 10:42:01 +02:00
David Négrier
10c56872fb
Merge pull request #2077 from thecodingmachine/use-tiled-objects
Read properties from Tiled objects
2022-04-20 08:33:31 +02:00
Lukas Hass
b8fd85fe15 lazy load TextGlobalMessage component 2022-04-20 08:09:37 +02:00
CEC
60ec09836b Fix prettier issue (2) 2022-04-19 17:55:16 +02:00
CEC
fe54217f64 Fix lint issue (2) 2022-04-19 17:48:43 +02:00
CEC
0d4e75202d Fix lint error 2022-04-19 17:38:39 +02:00
CEC
71a0e18049 Disconnect and redirect to login on error page 2022-04-19 17:31:43 +02:00
CEC
e45fcb371c Refactor catching of error from API : check the type of errors 2022-04-19 16:50:21 +02:00
Piotr 'pwh' Hanusiak
ec3b28271d fixed object areas not triggering properties change on immediate collision 2022-04-19 15:55:41 +02:00
Piotr 'pwh' Hanusiak
23092c75d6 merged develop 2022-04-19 12:43:56 +02:00
Piotr 'pwh' Hanusiak
30b82427d8 remove commented code 2022-04-19 12:42:08 +02:00
Piotr 'pwh' Hanusiak
92c79a89fe statuses swapping fixes 2022-04-19 12:27:39 +02:00
CEC
891ad2c34a Set generic error image from API 2022-04-19 11:23:22 +02:00
CEC
ecd0e86dc6 Fix prettier issue 2022-04-19 10:56:23 +02:00
CEC
5d360c8770 Add custom image from errors thrown by the API 2022-04-19 10:50:01 +02:00
David Négrier
ecda1a21a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into use-tiled-objects 2022-04-19 08:56:53 +02:00
David Négrier
638a32e1b0 Fixing DE lang linting 2022-04-19 08:52:26 +02:00
David Négrier
8c5c680cfb Adding a new "jitsiNoPrefix" property.
When set to "true", WorkAdventure will NOT prefix the Jitsi room name with a hash, gicing full control to the user over the Jitsi room name.
2022-04-19 08:52:26 +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
184aeb354a Remove differentiation between private and public rooms 2022-04-19 08:52:26 +02:00
Alban Bruder
1781b8423c Replace Room.getInstance with getter function 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
David Négrier
b49049d333 Merge branch 'develop' of github.com:thecodingmachine/workadventure into use-tiled-objects 2022-04-19 08:51:34 +02:00
null234
03909f14f7 Update report.ts
Better German for de-DE
2022-04-15 14:06:38 +02:00
Piotr 'pwh' Hanusiak
7385ce522f removed silentStore 2022-04-14 16:49:05 +02:00
CEC
ec2b23f32f Fix test for catch error in EntryScene 2022-04-14 15:36:05 +02:00
Piotr 'pwh' Hanusiak
61c68b0875 silent indicator when on jitsi zone 2022-04-14 14:31:31 +02:00
Piotr 'pwh' Hanusiak
91f299ba82 change status when entering silent zone 2022-04-14 12:37:31 +02:00
César Cardinale
3767555e38
Merge branch 'develop' into localAdmin 2022-04-14 11:55:04 +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
CEC
5ee13d2001 Fix prettier front 2022-04-13 18:00:32 +02:00
CEC
fb90324732 Fix import unused 2022-04-13 17:54:37 +02:00
CEC
710311036b Fix prettier and import unused 2022-04-13 17:49:04 +02:00
CEC
209dd43aac Deleted use of WAError and add defining of language of client everywhere 2022-04-13 17:42:44 +02:00
CEC
13b0996c8b Merge from develop 2022-04-13 17:27:42 +02:00
César Cardinale
d71b36d0fe
Merge branch 'develop' into codeAPI 2022-04-13 17:00:55 +02:00
CEC
26dc8dbbaf Review of changes asked to make code cleaner 2022-04-13 16:58:03 +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
CEC
bf40bd2f3b Fix prettier for the front 2022-04-13 14:51:15 +02:00
CEC
c3289e8a01 Fix Svelte depreciation reload 2022-04-13 14:51:15 +02:00
CEC
ecabdbe0c0 Refactoring Error Screen 2022-04-13 14:51:15 +02:00
Piotr 'pwh' Hanusiak
45e254b931 visible indicator for hero. Using images in order to fix graphic circles glitching out during movement 2022-04-13 14:31:18 +02:00
Lukas
348f6f68cd
fix chinese i18n types (#2080) 2022-04-13 12:05:15 +02:00
Piotr 'pwh' Hanusiak
a71d29d997 merged develop 2022-04-12 15:22:40 +02:00
Zachary Jia
08e843549c
Add chinese translation (#2074)
* add chinese translation
* fix prettier problem
2022-04-12 15:19:14 +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 'pwh' Hanusiak
d4f5dc6d35 moved focusable property handling away from gamescene 2022-04-12 12:47:45 +02:00
Piotr 'pwh' Hanusiak
54b6c3800e remove unused import 2022-04-12 11:43:52 +02:00
CEC
d972b3a2e6 Fix prettier for the front 2022-04-12 11:22:58 +02:00
CEC
074f43d16c Fix Svelte depreciation reload 2022-04-12 11:17:43 +02:00
Piotr 'pwh' Hanusiak
1ca393f3db open website linked from Tiled Object 2022-04-12 10:57:38 +02:00
CEC
748baa9bbc Refactoring Error Screen 2022-04-12 10:23:36 +02:00
David Négrier
a99815a1b4 Fixing comparison of constraints state
Comparison was broken because we were not performing a deep comparison.
2022-04-11 21:46:30 +02:00
Piotr 'pwh' Hanusiak
255f4375da go from zones to area name for interactive Tiled Objects 2022-04-11 16:16:52 +02:00
Piotr 'pwh' Hanusiak
67f4972292 little cleanup 2022-04-11 13:12:19 +02:00
Piotr 'pwh' Hanusiak
6a394945f3 we can now trigger events when stepping on tiled rectangular objects. WIP 2022-04-07 15:49:58 +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
Piotr 'pwh' Hanusiak
106ee755a8 call unsubscriber 2022-04-07 14:09:21 +02:00
Piotr 'pwh' Hanusiak
1df71e78e8 take both dominant speaker and jitsi participants count into consideration 2022-04-07 14:09:21 +02:00
Piotr 'pwh' Hanusiak
8cccc0f095 set is dominant speaker flag to false after leaving jitsi conversation 2022-04-07 14:09:21 +02:00
Piotr 'pwh' Hanusiak
0cce2a7ab8 show voice indicator above alpha-male (dominant) jitsi speaker 2022-04-07 14:09:21 +02:00
TabascoEye
4bd8be89c1 Update IframeEvent.ts 2022-04-06 18:24:23 +02:00
TabascoEye
d29e100385 enable sound stop API call
this link was missing, so "sound.atop()" does not do anything in the JS api
2022-04-06 18:24:23 +02:00
Piotr 'pwh' Hanusiak
a04c50e8b5 remove obsolete imports from EntryScene 2022-04-04 17:53:28 +02:00
Piotr 'pwh' Hanusiak
deaf6cd3f9 zooming was breaking CustomizationScene on second entry 2022-04-04 17:53:28 +02:00
Piotr 'pwh' Hanusiak
715da87f7a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-04-04 14:52:53 +02:00
Piotr 'pwh' Hanusiak
d6d2448058 little cleanup 2022-04-04 14:52:34 +02:00
Lukas Hass
f0b283ea24 Enable right click on overlay 2022-04-04 14:51:18 +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 'pwh' Hanusiak
92460eac44 Merge branch 'new_custom_woka_scene' of github.com:thecodingmachine/workadventure into new_custom_woka_scene 2022-04-04 14:20:48 +02:00
Piotr 'pwh' Hanusiak
7acebfa70c turn icon with animation 2022-04-04 14:10:50 +02:00
David Négrier
47b26d9a6c
Removing Customize as defaut scene 2022-04-04 14:07:13 +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
Piotr Hanusiak
32b777b5cf
New custom woka scene full clothes (#2023)
* center grid if possible

* whole outfit for every slot

* switched bodyPart slots into buttons

* change categories and body parts with WSAD / arrow keys

Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
2022-04-04 13:01:21 +02:00
Piotr 'pwh' Hanusiak
d0ad5f8299 custom background for slots 2022-03-30 13:02:02 +02:00
Piotr 'pwh' Hanusiak
4c93060f85 select and center on currently selected item 2022-03-30 11:16:58 +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
Piotr 'pwh' Hanusiak
ac9926b8d6 prevent actions menu from appearing when inserting space key on chat 2022-03-29 14:53:50 +02:00
David Négrier
469f9d9533
Merge pull request #2007 from thecodingmachine/fix-bubble-lock-away-mode
fix locking bubble when returning from away mode
2022-03-29 14:41:34 +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
Piotr 'pwh' Hanusiak
0e3529ae4a fix locking bubble when returning from away mode 2022-03-29 11:04:29 +02:00
Piotr 'pwh' Hanusiak
225f80b3ad fixed types for RoomConnection 2022-03-29 10:00:26 +02:00
Piotr 'pwh' Hanusiak
82dffff5a7 make use of proto well knows types 2022-03-28 17:08:12 +02:00
Piotr 'pwh' Hanusiak
1b2c67a4d7 removed obsolete console.log 2022-03-28 13:47:02 +02:00
Piotr 'pwh' Hanusiak
b95d5f1d10 merged develop 2022-03-28 13:16:29 +02:00
Piotr 'pwh' Hanusiak
ee88bf1b99 Merge branch 'develop' into new_custom_woka_scene 2022-03-28 12:30:26 +02:00
Piotr 'pwh' Hanusiak
81c5876a66 grid shadow and animations 2022-03-28 12:29:31 +02:00
David Négrier
5f07bff2a7 Applying German translation, thanks to @Lurkars 2022-03-28 09:26:40 +02:00