Commit Graph

4795 Commits

Author SHA1 Message Date
_Bastler
d12f89dfb5 fix emoji 2022-05-12 09:29:18 +02:00
_Bastler
895499a9bc Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-12 09:03:01 +02:00
_Bastler
82dc53c9c9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-12 09:02:34 +02:00
grégoire parant
36e74691cf
Change map details params (#2192)
* HotFix showPoweredBy optional paramter

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

* Add nullable option of showPoweredBy

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-05-11 18:03:47 +02:00
César Cardinale
5016c85ca4
Add swagger doc for the link pusher -> admin (#2146)
* Dissociate admin API from external API
* Add adminAPI doc for self-hosted
2022-05-11 17:43:25 +02:00
Alexis Faizeau
253ae60478 Add disable proximity meeting test map 2022-05-11 15:28:39 +02:00
Alexis Faizeau
1b4582fca0 Fix deny proximity meeting 2022-05-11 15:28:39 +02:00
Alexis Faizeau
c96c6a357c Add joystick & click to move on disable controls 2022-05-11 15:28:39 +02:00
Alexis Faizeau
fc7a7aa54d Fix uiWebsite updating 2022-05-11 15:28:39 +02:00
_Bastler
1fbba8a453 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-11 11:58:38 +02:00
David Négrier
e710c441b1 Improving typings
This PR solves a number of issues (but not all) found when enabling the rule ESLint rule "@typescript-eslint/no-unsafe-call" in the front.
2022-05-11 11:57:12 +02:00
_Bastler
2d469eda5d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-11 11:51:32 +02:00
_Bastler
d30e7b1393 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-11 11:42:32 +02:00
grégoire parant
aea8f92e68
Select first Woka (#2180)
* Select first Woka

 - Select the first Woka in the scene

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-05-11 11:41:43 +02:00
David Négrier
2ba1dad8e8 Adding a map to test startup on silent zone 2022-05-11 11:27:52 +02:00
Piotr 'pwh' Hanusiak
f279812b96 remove now obsolete console.log 2022-05-11 11:27:52 +02:00
Piotr 'pwh' Hanusiak
7316637834 make sure the user we try to get inside the group is not silent 2022-05-11 11:27:52 +02:00
Piotr 'pwh' Hanusiak
a6d6746c31 fix PlayerStore wrong availabilityStatus name 2022-05-11 11:27:52 +02:00
Piotr 'pwh' Hanusiak
a566f8d661 availabilityStatus info from websocket 2022-05-11 11:27:52 +02:00
Piotr 'pwh' Hanusiak
2b15faf4e8 make sure we subscribe to stores after estabilishing connection 2022-05-11 11:27:52 +02:00
Alexis Faizeau
5857c938d1 Update all docker nodejs container to the last LTS (16) 2022-05-10 12:03:22 +02:00
David Négrier
ae9170ba85 Fixing camera led always on
This commit fixes a race condition in the "getUserMedia" call that could lead to the webcam being in an always on state.

If we open and close the webcam really quickly, the camera close was sometimes passing BEFORE the open was fully resolved (because getUserMedia can take a few 100ms to answer properly).
As a result, the webcam would stay open.
To solve this, we are putting all calls to getUserMedia in a resolve chain (`currentGetUserMediaPromise`)

Closes #2149
2022-05-10 12:01:51 +02:00
Roger Meier
06d3332499 Remove .htaccess as it's no longer in use 2022-05-09 14:58:29 +02:00
Lukas Hass
53d1f81ab2 Fix nes-container border on chrome 2022-05-09 14:56:17 +02:00
Piotr Hanusiak
0b6c7b3913
unsubscribe from availabilityStatusStore (#2185) 2022-05-09 12:04:53 +02:00
_Bastler
8647199625 i18n 2022-05-09 08:40:29 +02:00
_Bastler
a50cbd3521 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-09 07:58:53 +02:00
_Bastler
1f11ab57f3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-09 07:58:46 +02:00
dependabot[bot]
8523781e9f
Bump ejs from 3.1.6 to 3.1.7 in /desktop/electron (#2145)
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-08 16:55:13 +02:00
César Cardinale
a6e0374257
All customized logo (#2168)
* Change dynamic logo in reconnecting scene

* Add cowebsite customized logo

* Fix prettier issues

* Fix prettier issues (2)

* Fix login scene PoweredBy

* Delete all console logs
2022-05-05 19:23:07 +02:00
Alexis Faizeau
657bf4d8d2 Fix media behavior management 2022-05-05 12:34:47 +02:00
_Bastler
47e5e360df Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-05-05 12:25:09 +02:00
Alexis Faizeau
f7caacc598 Implement disable/restore proximity meeting in api (#2166)
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2022-05-05 12:19:06 +02:00
Gregoire Parant
b6e006d7bb Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	messages/JsonMessages/MapDetailsData.ts
2022-05-05 11:55:41 +02:00
grégoire parant
a287d5e272
HotFix WebSocket error 1006 (#2063)
* Delete cookie posthog

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-05-05 11:46:59 +02:00
Piotr Hanusiak
f46d7d57f3
chat bubble above game tiles (#2129)
Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
2022-05-05 11:46:15 +02:00
Piotr Hanusiak
76bf7b9c74
fix broken custom scene if wrong characterLayers were loaded (#2164)
* fix broken custom scene if wrong characterLayers were loaded

* be sure to initialize selectedLayers

Co-authored-by: Piotr 'pwh' Hanusiak <p.hanusiak@workadventu.re>
2022-05-05 11:44:33 +02:00
Alexis Faizeau
9c5fcd2fd8
Implement UI Website (#2087)
* Implement UI Website system

* Add UIWebsite documentation

* Implement review fixes

* Add getAll function on UIWebsite

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2022-05-04 18:30:31 +02:00
César Cardinale
ad229460ef
Show or not the Powered by image (#2163)
* Show or not the Powered by image

* Fix prettier issues

* Fix prettier issues messages
2022-05-04 14:22:20 +02:00
César Cardinale
d47aad2ead
Change lost connection page to the new one (#2161)
* Change lost connection page to the new one
2022-05-04 10:13:18 +02:00
Alexis Faizeau
fb9f8adb21 Fix error on undefined path of desktop app interfaces 2022-05-02 14:25:43 +02:00
Alexis Faizeau
2358aac775 Fix the main coWebsite loader 2022-05-02 12:06:47 +02:00
grégoire parant
755ca93d49
New analytics feature (#2150)
* New analytics feature

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

* Fix eslint swaggerJsdoc

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-04-29 20:53:33 +02:00
David Négrier
5e156ade74
Refreshing map URL (#2144)
* Refreshing map URL

When a "refresh" message is sent from the admin to the pusher, the map details endpoint is now called again.
If the Map URL is changed, the variable manager is refreshed.
2022-04-28 15:44:36 +02:00
CEC
d6450831c6 Fix pretty doc 2022-04-28 11:51:55 +02:00
CEC
53b084ea7f Add new Swagger Doc for the pusher 2022-04-28 11:39:08 +02:00
CEC
231facbae2 Merge remote-tracking branch 'origin/develop' into swaggerPusher 2022-04-28 11:37:21 +02:00
Piotr 'pwh' Hanusiak
f9a4bcff29 send removeOutline flag if needed 2022-04-28 10:54:45 +02:00
David Négrier
a662096e1d
Merge pull request #2139 from thecodingmachine/develop
Deploy 2022-04-26 (1.10)
2022-04-27 18:45:51 +02:00
Piotr 'pwh' Hanusiak
9427ca8d7c clear activatableObjectsDistances map before setting up fresh values 2022-04-27 17:01:51 +02:00