_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,942 Commits 2 Branches 0 Tags 47 MiB
4913010273
Commit Graph

1771 Commits

Author SHA1 Message Date
David Négrier
5cd3ab4b4c Removing ts-ignore 2021-08-25 09:30:05 +02:00
GRL
f3c4d344b3 Add iframe submenu by scripting API 
Delete menu by scripting API
 2021-08-24 17:35:06 +02:00
_Bastler
f0a60d3907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-24 11:50:11 +02:00
Gregoire Parant
54fab3d233 Merge branch 'master' into develop 2021-08-24 10:45:03 +02:00
GRL
49eb28dacf Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-24 09:38:24 +02:00
_Bastler
2ce9451f2f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-23 19:31:49 +02:00
David Négrier
8c43c2e6e8 Rollback on createPromise switched to public 2021-08-23 18:54:00 +02:00
GRL
ad95fa5e11 Execute scripts of the map after creating gameScene 2021-08-23 18:53:59 +02:00
David Négrier
bf6ce94b80 Merge branch 'develop' of github.com:thecodingmachine/workadventure into samePlaceAfterEditProfile 2021-08-23 18:04:09 +02:00
GRL
2f76a24dff Contact page only if environment variable exist 2021-08-23 17:30:07 +02:00
Gregoire Parant
99a9b5f9a2 Update strategy to use css 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 10:20:48 +02:00
Gregoire Parant
8c4ead8421 Add "\n\r" to match 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:43:43 +02:00
Gregoire Parant
da00fa7868 Update escapeHtml 
Update escapeHtml in HtmlUtils class to create paragraphe when user have \r\n in popup text

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:16:22 +02:00
_Bastler
9790572928 typo 2021-08-23 09:07:07 +02:00
GRL
edfe440c6e Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-20 16:18:45 +02:00
_Bastler
092a14fa09 update front docker: stun 2021-08-20 12:49:12 +02:00
_Bastler
94328771bf update production docker stuff 2021-08-20 12:30:33 +02:00
GRL
c2b3d23ec0 Player return a the same position when after editing his profile (same as reconnection) 2021-08-20 09:49:37 +02:00
_Bastler
e82de52a35 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-19 19:24:24 +02:00
Gregoire Parant
4d4c9c8c6e Merge branch 'master' into develop 2021-08-19 18:50:34 +02:00
grégoire parant
e32f433688
Update cache version (#1383) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-19 18:48:24 +02:00
Gregoire Parant
86c32cf9ff Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/dist/service-worker-prod.js
 2021-08-19 18:31:30 +02:00
grégoire parant
1ffd198b00
Update cache management (#1382) 
Change strategy of cache management. Today we don't have version of map building so we cannot use cache correctly. The idea is to have a less cache and keep HTPP cache management with GET method.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-19 18:23:30 +02:00
GRL
0c796dff90 Player return a the same position when after editing his profile 2021-08-19 17:22:16 +02:00
GRL
2ebf05f7d6 Correction following test 2021-08-19 11:17:46 +02:00
_Bastler
6ff4f4f52e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-19 10:36:23 +02:00
_Bastler
4dfc04826e production tests 2021-08-19 10:09:42 +02:00
GRL
d6bd883c94 Third pass on css and reportMenu 2021-08-18 15:34:26 +02:00
David Négrier
8a64491952 Improving popup 
If a popup message is empty, only the buttons will be displayed (not the container)

Unrelated: the Sound.play method in the API now accepts 0 arguments.
 2021-08-18 11:53:41 +02:00
GRL
5a8e7d277f Second pass on css and reportMenu 2021-08-18 11:30:11 +02:00
GRL
4c3097155b Second pass on css and reportMenu 2021-08-18 11:15:46 +02:00
_Bastler
fc567e76f4 update dependencies, Iframe module loading 2021-08-17 20:33:20 +02:00
GRL
9e5cc3b9a7 First pass on css 2021-08-17 15:17:29 +02:00
GRL
096baa8897 First pass on css 2021-08-17 14:44:43 +02:00
grégoire parant
0bfac1a164
Update cache API index (#1378) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-17 13:26:20 +02:00
_Bastler
123d6fd535 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-17 11:40:32 +02:00
David Négrier
06be65c12f
Merge pull request #1368 from thecodingmachine/fix_zone_enter_exit 
Fixing enter/leave event not properly sent on adjacent zones
 2021-08-17 10:08:51 +02:00
David Négrier
1d45bab46d Fixing enter/leave event not properly sent on adjacent zones 
On adjacent zones, the zone leave event was not properly triggered when leaving a zone for the zone next to it.
Closes #1366
 2021-08-17 10:04:11 +02:00
_Bastler
940b08742a fix audiomanager 2021-08-16 19:37:26 +02:00
_Bastler
1958449178 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-16 19:21:09 +02:00
GRL
aa9e5c4543 Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-16 14:19:28 +02:00
GRL
151e63ff91 Suppression of gameManager in IframeListener 2021-08-16 11:56:00 +02:00
GRL
d2413896c7 GameManager has an attribute scenePlugin 2021-08-16 11:50:09 +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
_Bastler
1fd5c146e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-15 17:46:54 +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
_Bastler
1141272165 add module loading 2021-08-13 10:00:34 +02:00
_Bastler
0365fcb24d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-13 07:56:22 +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
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
_Bastler
9c7c1e091a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-11 12:10:44 +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
_Bastler
27d331ea37 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-10 10:25:24 +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
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
GRL
56fa2e49f6 New menu svelte 2021-08-09 14:49:17 +02:00
_Bastler
73a2cec4df merge 2021-08-08 15:47:53 +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
_Bastler
e9e96c9e30 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-05 20:46:42 +02:00
David Négrier
ac282db1ac Removing pointless console.log 2021-08-05 17:21:55 +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
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
Gregoire Parant
190007a21f Fix joystick postion 
- Aply new size after open and close iframe and permit to keep the good position of the joystick on the WorkAdventure screen
 2021-08-04 18:07:04 +02:00
_Bastler
d046460d76 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-04 18:02:49 +02:00
Gregoire Parant
f9992876df Update PWA apple icon 2021-08-04 15:05:11 +02:00
Gregoire Parant
383bbbdafe Force to add service worker js file 2021-08-04 14:31:12 +02:00
Gregoire Parant
707040b506 improve PWA and last room strating 2021-08-04 13:33:58 +02:00
David Négrier
4713010929 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-03 19:01:16 +02:00
Gregoire Parant
1ad9f5b045 Add new icon manifest 2021-08-03 17:49:25 +02:00
Gregoire Parant
d781b2eb91 Update favicon and service worker html 2021-08-03 17:28:27 +02:00
GRL
fe585297fc Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-03 17:19:47 +02:00
GRL
2d8098b06d Merge branch 'develop' of github.com:thecodingmachine/workadventure into layoutManagerSvelte 2021-08-03 11:40:51 +02:00
GRL
1436b15328 Migrate layoutManager in Svelte 2021-08-03 11:13:08 +02:00
Gregoire Parant
952e58ecc1 Fix ban message style 2021-08-03 00:34:07 +02:00
Gregoire Parant
14b4229019 Merge branch 'develop' into GlobalMessageToWorld 
# Conflicts:
#	CHANGELOG.md
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Components/App.svelte
#	pusher/src/Services/SocketManager.ts
 2021-08-02 23:07:39 +02:00
Gregoire Parant
2480d13f58 Merge branch 'master' into develop 2021-08-02 22:26:34 +02:00
Gregoire Parant
e07f4bf96f Add comment 2021-08-02 22:24:00 +02:00
Gregoire Parant
f2d382681b Merge branch 'develop' into loadTileset 
# Conflicts:
#	CHANGELOG.md
#	front/src/Phaser/Game/GameScene.ts
 2021-08-02 22:16:05 +02:00
Gregoire Parant
7bd444ade9 Revert "Squashed commit of the following:" 
This reverts commit c177f0a1b3.
 2021-08-02 22:13:10 +02:00