Commit Graph

3587 Commits

Author SHA1 Message Date
David Négrier
1845b8f66e
Merge pull request #1374 from thecodingmachine/GameManagerRefactor
GameManager has an attribute scenePlugin
2021-08-16 11:59:30 +02:00
GRL
151e63ff91 Suppression of gameManager in IframeListener 2021-08-16 11:56:00 +02:00
GRL
736ac19ed0 Merge remote-tracking branch 'origin/GameManagerRefactor' into GameManagerRefactor 2021-08-16 11:50:22 +02:00
GRL
d2413896c7 GameManager has an attribute scenePlugin 2021-08-16 11:50:09 +02:00
GRL
482a6da1d8 GameManager has an attribute scenePlugin 2021-08-16 11:43:29 +02:00
grégoire parant
005a3c5a0d
Release 1.4.14 (#1370)
* New version of cache management (#1365)

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

* Exit scene acess denied detected (#1369)

* Add auth token user to get right in admin and check if user have right

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

* Update error show

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

* Update token generation (#1372)

- Permit only decode token to get map details,
 - If user have token expired, set the token to null and reload the page. This feature will be updated when authentication stategy will be finished.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-15 23:13:48 +02:00
grégoire parant
8d57886bae
Update token generation (#1372)
- Permit only decode token to get map details,
 - If user have token expired, set the token to null and reload the page. This feature will be updated when authentication stategy will be finished.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-15 22:51:06 +02:00
grégoire parant
02a21209ec
Exit scene acess denied detected (#1369)
* Add auth token user to get right in admin and check if user have right

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

* Update error show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-15 08:51:35 +02:00
Lurkars
aa38d1a5bd initial localUserStore volume 2021-08-11 20:29:48 +02:00
Lurkars
0d27b4ad43 remove redundancy 2021-08-11 20:07:09 +02:00
Lurkars
3702173cd4 migrate to svelte 2021-08-11 20:01:51 +02:00
Lurkars
e8104f63ac Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-08-11 19:55:36 +02:00
Lurkars
5b979fa151 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-08-11 19:54:36 +02:00
grégoire parant
f7daf16ac5
New version of cache management (#1365)
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-11 17:09:17 +02:00
GRL
f4ce5f9a3b Merge branch 'ReportMenuSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-11 15:04:47 +02:00
GRL
46a2e3f453 Suppression of HTML files that aren't use anymore 2021-08-11 14:23:34 +02:00
GRL
e86892b9a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-11 14:13:31 +02:00
GRL
8105e966ff Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu
2021-08-11 14:07:34 +02:00
Gregoire Parant
45a56c2e02 HotFix feedback svelte continuous integration
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-11 10:09:04 +02:00
Gregoire Parant
434b112c65 Improve service worker store managment
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-11 10:01:56 +02:00
grégoire parant
bced495570
Add comment use service worker (#1355) 2021-08-10 23:10:56 +02:00
grégoire parant
c7fdfed00c
Improve mobile camera shown (#1354)
- Add new store to send mobile size
 - Update style to show video for mobile size
2021-08-10 22:35:26 +02:00
grégoire parant
22a46a98ea
Improve service worker (#1353)
* Improve service worker

 - Add new env variable in WebPack "NODE_ENV"
 - Add new service worker for mode dev that permit to by pass response in cache storage
 - Add new WorkAdventure icon

* Remove console.log

* Add service worker file prod and dev
2021-08-10 22:34:46 +02:00
Lurkars
fc1a7afd9a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-08-10 14:20:39 +02:00
grégoire parant
1db2e2aba9
Update style of microphone (#1352)
- Active microphone close when user haven't microphone in the discussion
2021-08-10 10:12:31 +02:00
grégoire parant
dbe7dc4ce0
Merge pull request #1348 from thecodingmachine/develop
Release v1.4.14
2021-08-09 23:15:31 +02:00
GRL
9c1926f636 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-09 16:59:12 +02:00
GRL
d10e2dbca7 Migration of report menu in svelte 2021-08-09 16:56:28 +02:00
grégoire parant
a5b44be6a1
Update JWT expires days (#1349) 2021-08-09 16:37:24 +02:00
grégoire parant
ddecf48697
Update JWT expires days (#1347) 2021-08-09 16:31:55 +02:00
GRL
56fa2e49f6 New menu svelte 2021-08-09 14:49:17 +02:00
Datalog-Mindhack
bc24a6b1db
Update package.json (#1344)
Thans for your Merge Request 🚀
2021-08-09 14:36:53 +02:00
Lurkars
06290cdd78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-08-08 19:33:58 +02:00
Gregoire Parant
154f8f03da Merge branch 'master' into develop 2021-08-06 18:29:09 +02:00
grégoire parant
fbcb9d898d
Update report message (#1343) 2021-08-06 18:28:18 +02:00
felixdoerre
d051650457
Delete sol_intérieur.png (#1341)
The file was initially renamed but accidentally re-added later. Removing it finished the move.
2021-08-06 17:23:22 +02:00
Gregoire Parant
af613f5b5b Merge branch 'master' into develop 2021-08-06 15:53:33 +02:00
GRL78
e0fb31fc58
WIP: Migrate AudioManager in Svelte (#1325)
* Migrate AudioManager in Svelte

* use import type when needed
2021-08-06 09:11:17 +02:00
David Négrier
ac282db1ac Removing pointless console.log 2021-08-05 17:21:55 +02:00
David Négrier
56cf535551
Merge pull request #1312 from thecodingmachine/iframe_in_map
Adding the ability to inject websites directly inside maps
2021-08-05 12:44:23 +02:00
David Négrier
6b9b999996 Making embedded iframes scriptable using the WA.room.website namespace. 2021-08-05 12:37:05 +02:00
David Négrier
5bb29e99ba Adding a "allowApi" property to authorize the API in a website. 2021-08-05 12:30:07 +02:00
David Négrier
ce3c53ae3f Adding the ability to inject websites directly inside maps
This PR adds the ability to inject a website INSIDE a map (as an iframe inside a Phaser HTML object)
The iFrame will be rendered transparently, unless you set a background-color on the body, which opens a number of cool possibilities.

Needs to be done: allowing the iframe API in those iframes.
2021-08-05 12:30:05 +02:00
David Négrier
a09f27b448
Merge pull request #1227 from jonnytest1/trigger-message-refv3
trigger message api refactorv3
2021-08-05 12:18:55 +02:00
David Négrier
570110f831 Fixing openWebsiteTriggerMessage not hidden when moving out of zone. 2021-08-05 12:07:12 +02:00
David Négrier
bc1c6a4986 Refactoring displayActionMessage signature. Now accepting an options object. This should allow for more options in the future. 2021-08-05 12:02:00 +02:00
David Négrier
87e4367455 Refactoring layoutManagerActionStore. It now supports an uuid field.
layoutManagerVisibilityStore is now a derived field from layoutManagerActionStore.
2021-08-05 11:19:28 +02:00
GRL
2cd5b7f0a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-05 10:01:23 +02:00
David Négrier
92fee33b64 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-05 09:24:05 +02:00
David Négrier
d1e5d57459 Changing the method name from "triggerMessage" to "displayActionMessage".
Generally speaking, I like to call the message at the bottom an "action message".
And things can "trigger" it, but in the case of a method that actually proactively displays the message, I find "displayActionMessage" to be a better name.

Also, removing package-lock files and improving code style
2021-08-05 09:17:33 +02:00