Commit Graph

4795 Commits

Author SHA1 Message Date
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
a8d56263ea leave group immediately if status changed to silent | jitsi 2022-04-20 14:32:23 +02:00
Piotr 'pwh' Hanusiak
8ff791e024 removed obsolete collider from map 2022-04-20 13:25: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
Piotr 'pwh' Hanusiak
7147378a89 AvailabilityStatus set for Users in tests 2022-04-20 10:28:26 +02:00
Piotr 'pwh' Hanusiak
1cc34b94ca fixed tests for position notifier 2022-04-20 09:58:10 +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
b5039d14e2 Fix prettier issues 2022-04-19 17:35:47 +02:00
CEC
71a0e18049 Disconnect and redirect to login on error page 2022-04-19 17:31:43 +02:00
CEC
163ee872bf Fix lint & prettier issues 2022-04-19 17:11:51 +02:00
CEC
5a0eec1eb9 Fix cast bigInt -> number / Prettier issue 2022-04-19 17:02:08 +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
9aaf2539bc Merge branch 'use-tiled-objects' of github.com:thecodingmachine/workadventure into use-tiled-objects 2022-04-19 12:47:11 +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
86e84f455a Merge remote-tracking branch 'origin/develop' into swaggerPusher 2022-04-19 11:27:39 +02:00
CEC
891ad2c34a Set generic error image from API 2022-04-19 11:23:22 +02:00
CEC
322f9ca707 Fix prettier issue (pusher) 2022-04-19 10:57:11 +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
6a202fff49 run pretty 2022-04-19 08:52:26 +02:00
Alban Bruder
82be015fc5 Compute instance in back getMapDetails 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
29f1e17767 Merge branch 'localAdmin' into swaggerPusher
# Conflicts:
#	pusher/src/Services/AdminApi.ts
2022-04-14 15:48:36 +02:00
CEC
bb675184e2 Merge remote-tracking branch 'origin/develop' into swaggerPusher 2022-04-14 15:44:21 +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
CEC
0ac6b50469 Fix prettier and change last use of adminAPI to Service way 2022-04-14 11:59:35 +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
CEC
317e0d3787 Implement all use of AdminService
Implement and generalize adminApi and localAdmin from adminInterface
2022-04-14 11:33:00 +02:00