_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,472 Commits 2 Branches 0 Tags 47 MiB
066ffe8bfd
Commit Graph

2055 Commits

Author SHA1 Message Date
TabascoEye
e6ae343975
Update CoWebsiteManager.ts 
typos and style
 2021-08-30 19:44:50 +02:00
TabascoEye
da03e60de4
Update GameScene.ts 
typo fixed
 2021-08-30 19:42:18 +02:00
¯\_(ツ)_/¯
ae3e2a09d9 add possibility to set size of coWebsite and Jitsis via map property 2021-08-30 19:32:02 +02:00
_Bastler
a633f79dd7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 20:19:30 +02:00
David Négrier
d2816220eb
Merge pull request #1395 from thecodingmachine/triggerOnSetLayer 
Properties changed via the Iframe API now trigger changes directly
 2021-08-27 17:41:58 +02:00
David Négrier
7576fbbe6d
Merge pull request #1392 from thecodingmachine/iframeMenuScript 
Iframe menu script
 2021-08-27 17:41:04 +02:00
David Négrier
10c08dea6d
Merge pull request #1393 from thecodingmachine/variableHasProxy 
Fixing "has/in" on variables proxy object
 2021-08-27 15:07:50 +02:00
David Négrier
4536a63e69 Properties changed via the Iframe API now trigger changes directly 
Changes performed in WA.room.setPropertyLayer now have a real-time impact.
If the property is changed on a layer the current player is on, the changes will be triggered.
 2021-08-27 15:05:14 +02:00
David Négrier
a0d3685227 Fixing "has/in" on variables proxy object 
When using WA.state, using `"myVariable" in WA.state` would always return false.
This is now fixed by adding a "has" method on the Proxy class.

Also, added a `WA.state.hasVariable` method.
 2021-08-27 11:29:59 +02:00
GRL
706f531ca2 Add types file in API 2021-08-27 11:17:48 +02:00
GRL
a195870cfb Correct bad change 2021-08-27 11:12:23 +02:00
GRL
833c15b2d5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframeMenuScript 2021-08-27 10:44:32 +02:00
_Bastler
20cee5cb12 migrate from latest dev 2021-08-27 10:40:50 +02:00
_Bastler
e806325da9 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 10:40:30 +02:00
GRL
cf7bfe79ca Refactor to only have one function registerMenuCommand 
When selected custom menu is removed, go to settings menu
Allow iframe in custom menu to use Scripting API
Return menu object when it is registered, can call remove function on it
 2021-08-27 10:34:03 +02:00
GRL78
7c956d1481
REVIEW : Migration Menu and Report Menu in Svelte (#1363) 
* WIP: svelte menu

* temp

* temp

* New menu svelte

* Migration of report menu in svelte

* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu

* Suppression of HTML files that aren't use anymore

* fix deeployer

* First pass on css

* First pass on css

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Third pass on css and reportMenu

* Correction following test

* Contact page only if environment variable exist

* Update service worker

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

* Change requested

* Change requested

Co-authored-by: kharhamel <oognic@gmail.com>
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-26 12:01:07 +02:00
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
Gregoire Parant
c177f0a1b3 Squashed commit of the following: 
commit 41748a4036
Merge: 3b1d4d63 4991a70b
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:38:37 2021 +0200

    Merge pull request #1327 from thecodingmachine/hotFixErrorCardBack

    Fix error generated

commit 4991a70bba
Author: Gregoire Parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:34:03 2021 +0200

    Fix error generated

    Don't generate error if file is Invalid

commit 3b1d4d630c
Merge: f52b4598 02e5860e
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:03:18 2021 +0200

    Merge pull request #1326 from thecodingmachine/HotFixCreateMapFeature

    Hot fix create map feature

commit 02e5860e43
Author: Gregoire Parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 20:59:13 2021 +0200

    HotFix redirect on production domain of WorkAdventure

     - Update domain `ADMIN_URL` by `workadventu.re`

commit f52b459872
Merge: 3d657b4a 3ab069d6
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 11:23:16 2021 +0200

    Merge pull request #1324 from thecodingmachine/develop

    Release v1.4.11

commit 3ab069d650
Merge: 2b748138 9d4ffe54
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 15:51:07 2021 +0200

    Merge pull request #1323 from thecodingmachine/openIDPoc

    FIX: bomp the node version of pusher

commit 9d4ffe542c
Author: kharhamel <oognic@gmail.com>
Date:   Fri Jul 30 15:50:30 2021 +0200

    FIX: bomp the node version of pusher

commit 2b7481383f
Merge: 74975ac9 9c803a69
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 15:48:56 2021 +0200

    Merge pull request #1251 from thecodingmachine/openIDPoc

    POC for the openID connect

commit 9c803a69ff
Author: kharhamel <oognic@gmail.com>
Date:   Tue Jul 27 16:37:01 2021 +0200

    FEATURE: users can now login via an openID client

commit 74975ac9d8
Merge: 315fe7ca ebdcf880
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 14:54:33 2021 +0200

    Merge pull request #1322 from thecodingmachine/improveCapacityWarning

    FEATURE: improved the room capacity warning visuals

commit ebdcf8804d
Author: kharhamel <oognic@gmail.com>
Date:   Fri Jul 30 14:08:27 2021 +0200

    added admin link to the warning container

commit 41ac51f291
Author: kharhamel <oognic@gmail.com>
Date:   Thu Jul 29 18:02:36 2021 +0200

    FEATURE: improved the room capacity warning visuals

commit 315fe7ca82
Author: David Négrier <d.negrier@thecodingmachine.com>
Date:   Thu Jul 29 17:49:51 2021 +0200

    Adding a "font-family" property for text objects. (#1311)

    - Tiled displays your system fonts.
    - Computers have different sets of fonts. Therefore, browsers never rely on system fonts
    - Which means if you select a font in Tiled, it is quite unlikely it will render properly in WorkAdventure

    To circumvent this problem, in your text object in Tiled, you can now add an additional property: `font-family`.

    The `font-family` property can contain any "web-font" that can be loaded by your browser.

    This allows us to use the "Press Start 2P" 8px font in text objects, which renders way better than the default "Sans serif" font of your browser.

commit 7ffe564e8e
Author: GRL78 <80678534+GRL78@users.noreply.github.com>
Date:   Thu Jul 29 17:42:16 2021 +0200

    Graphic upgrade of the global message console (#1287)

    * Graphic upgrade of the global message console
    Fix: error if LoginScene doesn't exist

    * Rework graphic of global message console

    * Rework graphic of global message console

    * Remove console.log

commit 2a1af2a131
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Thu Jul 29 16:42:31 2021 +0200

    PWA service workers (#1319)

    * PWA services worker

    - [x] Register service worker of PWA to install WorkAdventure application on desktop and mobile
    - [x] Create webpage specifique for PWA
    - [ ] Add register service to save and redirect on a card
    - [ ] Add possibilities to install PWA for one World (with register token if existing)

    * Finish PWA strategy to load last map visited

    * Fix feedback @Kharhamel

    * Fix feedback @Kharhamel
 2021-08-02 22:06:24 +02:00
Gregoire Parant
02e5860e43 HotFix redirect on production domain of WorkAdventure 
- Update domain `ADMIN_URL` by `workadventu.re`
 2021-08-02 20:59:13 +02:00
kharhamel
9c803a69ff FEATURE: users can now login via an openID client 2021-07-30 15:43:46 +02:00
Kharhamel
74975ac9d8
Merge pull request #1322 from thecodingmachine/improveCapacityWarning 
FEATURE: improved the room capacity warning visuals
 2021-07-30 14:54:33 +02:00
kharhamel
ebdcf8804d added admin link to the warning container 2021-07-30 14:50:11 +02:00
GRL
bd96a32d5b Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-30 09:38:28 +02:00
kharhamel
41ac51f291 FEATURE: improved the room capacity warning visuals 2021-07-29 18:27:53 +02:00
GRL
6ac25d344b Use const 2021-07-29 17:56:28 +02:00
_Bastler
617435ea4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-29 17:54:15 +02:00
David Négrier
315fe7ca82
Adding a "font-family" property for text objects. (#1311) 
- Tiled displays your system fonts.
- Computers have different sets of fonts. Therefore, browsers never rely on system fonts
- Which means if you select a font in Tiled, it is quite unlikely it will render properly in WorkAdventure

To circumvent this problem, in your text object in Tiled, you can now add an additional property: `font-family`.

The `font-family` property can contain any "web-font" that can be loaded by your browser.

This allows us to use the "Press Start 2P" 8px font in text objects, which renders way better than the default "Sans serif" font of your browser.
 2021-07-29 17:49:51 +02:00
GRL78
7ffe564e8e
Graphic upgrade of the global message console (#1287) 
* Graphic upgrade of the global message console
Fix: error if LoginScene doesn't exist

* Rework graphic of global message console

* Rework graphic of global message console

* Remove console.log
 2021-07-29 17:42:16 +02:00
_Bastler
dcc67b1521 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-29 17:01:58 +02:00
_Bastler
ff686cf025 merge latest dev 2021-07-29 17:01:13 +02:00
grégoire parant
2a1af2a131
PWA service workers (#1319) 
* PWA services worker

- [x] Register service worker of PWA to install WorkAdventure application on desktop and mobile
- [x] Create webpage specifique for PWA
- [ ] Add register service to save and redirect on a card
- [ ] Add possibilities to install PWA for one World (with register token if existing)

* Finish PWA strategy to load last map visited

* Fix feedback @Kharhamel

* Fix feedback @Kharhamel
 2021-07-29 16:42:31 +02:00
GRL
eb8404ac91 Initialise iframeListener in preload 
Add documentation and CHANGELOG
 2021-07-29 15:53:27 +02:00
GRL
5f7361156b Merge branch 'develop' of github.com:thecodingmachine/workadventure into loadTileset 2021-07-29 15:35:32 +02:00
GRL
897a01bb79 Loading a tileset create a new GameMap 2021-07-29 14:14:40 +02:00
GRL
73d589ad11 Load a json file that describe a tileset in Tile format. 
Then add it to the tilemap of the GameScene
Then add if to the GameMap
 2021-07-28 18:03:19 +02:00
_Bastler
b2d1ace0ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 13:25:26 +02:00
Gregoire Parant
4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +02:00
_Bastler
3c52bb3dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 08:25:52 +02:00
Stefan Weil
64065b2798
Fix some typos (found by codespell) (#1316) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2021-07-27 14:29:09 +02:00
GRL78
95af568653
Link will now be white and underline + Click on the game to lose focus of input field (#1315) 
* Link will now be white and underline
Click on the game to lose focus of input field

* Use bind:this instead of querySelector
Add isClickedInside and isClickedOutside to HtmlUtils to know if the user click inside/outside an element targeted
 2021-07-27 14:28:35 +02:00
grégoire parant
fc9865e273
HotFix position WOKA (#1317) 
- Fix the moving position when a user enters in "custom your own" with custom WOKA loaded from admin
 2021-07-27 14:28:00 +02:00
David Négrier
cdd61bdb2c Merging with develop 2021-07-23 16:41:38 +02:00
GRL
9e8bed7aab Position of quill tooltip 
Use inlineStyle to indent and align text correctly
 2021-07-23 16:17:53 +02:00
David Négrier
3d5c222957 Reverting changes regarding single quotes 2021-07-23 14:59:56 +02:00
David Négrier
a146065cc6 Reverting changes regarding single quotes 2021-07-23 14:55:14 +02:00
GRL
ba6e6235d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-23 14:10:43 +02:00
_Bastler
07b3dc0f5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-23 12:18:30 +02:00
David Négrier
2aba6b1c27 Fixing loop when setting variables 
Setting a variable would makes the application enter in an infinite loop of events (between all the scripts and the back)
This fix makes sure a variable does not emit any event if it is changed to a value it already has.
 2021-07-23 11:51:01 +02:00
GRL
807abaa2c0 Text global message use delta instead of text 2021-07-23 11:07:17 +02:00
_Bastler
b6693b9ea7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 18:41:01 +02:00
GRL
9fa7c7aac0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 17:29:00 +02:00
David Négrier
84df25f863 Improving WA.state typings 2021-07-22 17:14:36 +02:00
GRL
68ff1b9e17 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 16:26:01 +02:00
GRL
9e16bfc366 playGlobalMessage are receive as adminRoomMessage 
Suppression of GlobalMessageManager and TypeMessage
Migrating message to svelte
 2021-07-22 16:14:27 +02:00
_Bastler
b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier
9b2914cc63
Merge pull request #1239 from thecodingmachine/scripting_api_room_metadata 
Allowing loading/saving "metadata" from a room
 2021-07-22 11:28:12 +02:00
David Négrier
31811ab906 Improve docblock 2021-07-22 11:24:30 +02:00
David Négrier
ae5617f3a0 Simplifying promises 2021-07-22 10:41:45 +02:00
Lurkars
285f1ebe89 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-07-21 19:26:29 +02:00
_Bastler
39561b315c Twemoji Picker 2021-07-21 18:54:43 +02:00
_Bastler
3ccc471d2f Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-21 18:53:05 +02:00
David Négrier
080d495044 Renaming WA.room.getMap to WA.room.getTiledMap 2021-07-21 16:40:53 +02:00
Valdo Romao
cd49fd5b83 Fixe openPopup deprecated annotation 2021-07-21 16:10:30 +02:00
David Négrier
f435cecfdc Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-21 15:37:53 +02:00
Lurkars
7285122fed fix port 2021-07-21 12:00:15 +02:00
Lurkars
9d518eded8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-07-21 11:56:36 +02:00
Lurkars
d43202d90d fix userInput 2021-07-21 10:17:46 +02:00
Lurkars
f43deff626 use emote button 2021-07-21 09:41:22 +02:00
_Bastler
28583ad9c0 update chat 2021-07-20 21:17:54 +02:00
_Bastler
c9b3835f99 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-20 20:31:01 +02:00
David Négrier
2d55f982d3 Removing the 'search' parameters from the room URL sent to pusher 2021-07-20 18:29:41 +02:00
grégoire parant
b336e3b08a
Delete logo TCM on Error scene (#1297) 2021-07-20 16:45:24 +02:00
Lurkars
83bd19c8dc Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-07-20 16:27:49 +02:00
GRL
6e65952d75 SendGlobalMessage by sendAminMessage 2021-07-20 15:16:51 +02:00
GRL78
936f5d0301
Icon chat not italic or bold (#1296) 2021-07-20 10:28:40 +02:00
_Bastler
a503866311 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-19 18:56:01 +02:00
David Négrier
ac3d1240ae Setting a variable to undefined now removes it from server-side storage. 2021-07-19 18:46:33 +02:00
GRL78
697f316780
In SelectCharacterScene, if custom character not loaded then select the first character (#1284) 2021-07-19 17:06:36 +02:00
GRL78
9432c82386
Change address mail to contact us (#1282) 2021-07-19 17:05:23 +02:00
David Négrier
dbd5b80636 Adding support for "readableBy" and "writableBy" in back 
This means that we are now loading maps from server side.
 2021-07-19 10:16:43 +02:00
GRL
0d3c697add Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-19 10:01:13 +02:00
GRL
71bf6b362b Rework graphic of global message console 2021-07-19 09:38:49 +02:00
GRL
214226a271 Rework graphic of global message console 2021-07-19 09:22:47 +02:00
_Bastler
1054f6e0fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 18:11:06 +02:00
Kharhamel
d8176c2f8d
Merge pull request #1291 from thecodingmachine/chatTweak 
FEATURE: chat tweak
 2021-07-16 15:49:36 +02:00
kharhamel
f840034d9c FEATURE: chat tweak 2021-07-16 14:25:59 +02:00
David Négrier
3d76f76d3e Fixing merge 2021-07-16 11:37:44 +02:00
David Négrier
5c7ea7b258 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-16 11:22:36 +02:00
_Bastler
bcfdcafa81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 11:11:06 +02:00
_Bastler
c390615dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 08:33:40 +02:00
David Négrier
d0d191fc28 Removing useless ternary 2021-07-15 17:12:54 +02:00
David Négrier
f217fc8aad Removing dead code 2021-07-15 17:11:48 +02:00
David Négrier
c9fa9b9a92 Migrating away from the notion of public/private URL in WorkAdventure Github repository 
The notion of public/private repositories (with /_/ and /@/ URLs) is specific to the SAAS version of WorkAdventure.
It would be better to avoid leaking the organization/world/room structure of the private SAAS URLs inside the WorkAdventure Github project.

Rather than sending http://admin_host/api/map?organizationSlug=...&worldSlug=...&roomSlug=...., we are now sending /api/map&playUri=...
where playUri is the full URL of the current game.
This allows the backend to act as a complete router.
The front (and the pusher) will be able to completely ignore the specifics of URL building (with /@/ and /_/ URLs, etc...)
Those details will live only in the admin server, which is way cleaner (and way more powerful).
 2021-07-15 17:07:47 +02:00
kharhamel
285079cae2 FIX: VideoPeer destroy could be called twice 2021-07-15 16:31:43 +02:00
kharhamel
18a65651f3 FIX: media box should always have a height 2021-07-15 16:08:37 +02:00
GRL
e43ea3aa5e Graphic upgrade of the global message console 
Fix: error if LoginScene doesn't exist
 2021-07-15 15:09:35 +02:00
_Bastler
b9e8c970f2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-14 19:36:16 +02:00
Kharhamel
5f43aeba85
Merge pull request #1283 from thecodingmachine/fixVisitChatInteraction 
FIX: visit card is now an absolute position
 2021-07-13 17:20:29 +02:00
Kharhamel
091f3aa7ee
Merge pull request #1202 from thecodingmachine/betterNotifications 
improved the notifications
 2021-07-13 17:19:12 +02:00
kharhamel
e96cb6930b FIX: visit card is now an absolute position 2021-07-13 17:14:40 +02:00
kharhamel
3983d0c5bc FEATURE: improved the notification system 2021-07-13 16:54:11 +02:00
_Bastler
3e60042164 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:38 +02:00
_Bastler
304c3e8906 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:34 +02:00
GRL78
b2ea368097
Migrate getCurrentUser() to WA.player (#1279) 2021-07-13 15:13:14 +02:00
kharhamel
1ce801cced temp 2021-07-13 14:40:35 +02:00
kharhamel
50f3af81e4 temp 2021-07-13 14:40:35 +02:00
kharhamel
fecbc8a018 WIP: svelte menu 2021-07-13 14:40:35 +02:00
Kharhamel
41a1f56bd5
Merge pull request #1111 from thecodingmachine/svelteChat 
FEATURE: migrated the chat window to svelte
 2021-07-13 11:25:38 +02:00
GRL
01bfbc36b5 Merge branch 'svelteChat' of github.com:thecodingmachine/workadventure into svelteChat 2021-07-13 11:09:32 +02:00
GRL
f7127bfb5a Graphic upgrade 2 2021-07-13 11:05:34 +02:00
GRL
a093298993 Graphic upgrade 2 2021-07-13 11:00:32 +02:00
GRL
e2e94c11ff Autoscroll 2021-07-12 15:00:28 +02:00
grégoire parant
022d1fec63
ServiceWorker (#1243) 
- Create service worker to have PWA
 - Add install service worker
 - Add fecth service worker with a persistent cache navigator
 - Add favicon 512x512
 2021-07-12 13:17:45 +02:00
GRL
b9a2433283 Upgrade graphic of the chat 2021-07-12 11:59:05 +02:00
David Négrier
52fd9067b8 Editing do to add "state" API doc 2021-07-08 11:46:30 +02:00
_Bastler
bcab6ae1f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-08 08:20:42 +02:00
David Négrier
b1cb12861f Migrating variables functions to the "state" namespace. 2021-07-07 22:14:59 +02:00
kharhamel
3cfbcc6b02 FEATURE: migrated the chat window to svelte 2021-07-07 18:07:58 +02:00
David Négrier
e65e8b2097 First version with variables that actually work 2021-07-07 17:17:28 +02:00
David Négrier
ae9af56661
Merge pull request #1264 from thecodingmachine/UpdateShowHideLayer 
Show/Hide Layer now unset collision and can show/hide all the layer in a group layer
 2021-07-07 17:15:41 +02:00
GRL
64c569c42f Add documentation and CHANGELOG 
Modify error message
 2021-07-07 17:06:23 +02:00
GRL
41c60579a6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateSetTiles 2021-07-07 17:00:10 +02:00
GRL
e50292a2ba Add documentation 
No second parameter
 2021-07-07 16:58:54 +02:00
David Négrier
0a1c01fb26
Merge pull request #1266 from thecodingmachine/UpdateSetPropertyLayer 
SetProperty delete a property where tha value is undefined and load the map of exitUrl property
 2021-07-07 16:44:32 +02:00
grégoire parant
17525e1e15
Return at the new line into the Pop-up (#1267) 
Add regex to replace "\r\n" or "\r" or "\n" by <br/>
 2021-07-07 16:42:26 +02:00
GRL
6f6ad949ca Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateShowHideLayer 2021-07-07 16:34:36 +02:00
GRL
24811e0a31 SetProperty delete a property where tha value is undefined and load the map of exitUrl property 2021-07-07 14:59:40 +02:00
GRL
bef5e139c0 SetTiles can now set a tile to null so that there is no more tile. 2021-07-07 14:42:17 +02:00
GRL
d51ac45079 Show/Hide Layer now unset collision and can show/hide all the layer in a group layer 2021-07-07 14:26:53 +02:00
_Bastler
303aef3e68 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-07 12:20:28 +02:00
David Négrier
5116b82e77 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-07 11:55:00 +02:00
David Négrier
34cb0ebf39 Users blocking now rely on UUID rather than ID 
This way, if a user A blocks another user B, if user B refreshes the browser or leaves and re-enters the room, user B will still be blocked.
As a side effect, this allows us to completely remove the "sockets" property in the SocketManager on the Pusher.
 2021-07-07 11:24:51 +02:00
David Négrier
19bd1045e1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-06 17:24:16 +02:00
David Négrier
46e6917df6 Adding a playersStore 
The playerStore can be useful to get the details of a given player from its ID.
 2021-07-06 17:13:08 +02:00
David Négrier
cb78ff333b Adding client side check of setVariable with writableBy property 2021-07-06 10:58:12 +02:00
David Négrier
86fa869b20 Actually using Type Guards in queries received by WA. 2021-07-06 10:26:44 +02:00
David Négrier
0aa93543bc Adding warning if "template" object is used as a variable 2021-07-05 18:48:26 +02:00
David Négrier
bf17ad4567 Switching setVariable to a query and fixing error hangling in query mechanism 2021-07-05 18:29:34 +02:00
David Négrier
c30de8c6db Adding support for default variables values 2021-07-05 17:25:23 +02:00
jonny
4ea6a12d20 cast callback 2021-07-05 16:26:29 +02:00
David Négrier
abd53b6251 Adding WA.onInit method to wait for API startup. 2021-07-05 14:41:10 +02:00
David Négrier
62a4814961 Migrating WA.player.getCurrentUser and WA.room.getCurrentRoom to direct property access and WA.room.getMap 2021-07-05 11:53:33 +02:00
_Bastler
7932b7488f update emotes 2021-07-03 11:15:18 +02:00
_Bastler
74823177f5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-02 20:59:39 +02:00
jonny
9bcdc9ba33 linter fixes 2021-07-02 19:05:03 +02:00
jonny
310e131a6e eslint restart 2021-07-02 19:03:34 +02:00
jonny
369d453455 Merge remote-tracking branch 'remotes/upstream/develop' into trigger-message-refv3 2021-07-02 18:49:22 +02:00
David Négrier
ea1460abaf Adding variables (on the front side for now) 2021-07-02 17:36:43 +02:00
David Négrier
280c59e6b5 Changing callback signature of registerAnswerer so that it can return a value and not necessarily a promise. 2021-07-02 17:26:28 +02:00
David Négrier
5b4a72ea1f Add new "query/answer" utility functions for the scripting API 
So far, the scripting API was using events to communicate between WA and the iFrame.
But often, the scripting API might actually want to "ask" WA a question and wait for an answer.

We dealt with this by using 2 unrelated events (in a mostly painful way).

This commit adds a "queryWorkadventure" utility function in the iFrame API that allows us
to send a query, and to wait for an answer. The query and answer events have a unique ID to be
sure the answer matches the correct query.

On the WA side, a new `IframeListener.registerAnswerer` method can be used to register a possible answer.
 2021-07-02 16:49:22 +02:00
GRL
8644389d7e remove unnecessary conversion type 2021-07-02 14:45:27 +02:00
GRL
c5b5326480 setProperty function doesn't set an empty array if property doesn't exist 2021-07-02 14:40:18 +02:00
GRL
e1611969ce Merge branch 'develop' of github.com:thecodingmachine/workadventure into jonnytest1-tiles-start-positions 2021-07-02 14:35:28 +02:00
_Bastler
413f1ea6df fix 2021-07-01 13:48:03 +02:00
_Bastler
2701d656da Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-01 12:10:53 +02:00
_Bastler
72a07467c5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-01 12:10:26 +02:00
GRL
01d02124d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-07-01 11:38:33 +02:00
David Négrier
bfcdd31ed2 Fixing NPM package generation 
The generation was broken due to the refactoring in several classes (some of them where not properly exported).
Also, trying to generate the NPM package on every build now (to detect issues).
 2021-06-30 10:15:55 +02:00
_Bastler
ee1e4c1910 merge dev 2021-06-29 20:21:00 +02:00
David Négrier
8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
GRL
95bd639124 More statement 2021-06-29 16:50:33 +02:00
GRL
6462773e7f Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-29 14:16:19 +02:00
_Bastler
086243b92f twemoji emote menu 2021-06-29 09:52:13 +02:00
GRL
b457ce493b Suppress console.log 2021-06-29 09:44:57 +02:00
GRL
dad8cdef8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI 2021-06-29 09:42:20 +02:00
_Bastler
e1fd474420 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-29 09:40:33 +02:00
Lurkars
445449d2db remove port change for sync 2021-06-29 08:40:24 +02:00
Lurkars
81f2c8b746 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-06-29 08:37:08 +02:00
Lurkars
c264364752 Twemoji Emote Menu 2021-06-29 08:37:01 +02:00
_Bastler
44791d113d Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-29 07:52:33 +02:00
Valdo Romao
723001e1e7 Added better favicon 2021-06-29 00:12:00 +01:00
GRL
389ca25b6a Cowebsite opened by script can use Iframe Api 2021-06-28 18:00:48 +02:00
Valdo Romao
4cf5a6f7a0 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon 2021-06-28 15:56:28 +01:00
David Négrier
3fd4f9d384 Adding a warning message if an unauthorized iFrame tries to communicate with WA 
Closes #1241
 2021-06-28 15:20:27 +02:00
_Bastler
f13282f424 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-28 15:02:24 +02:00
David Négrier
1e57028e6e Renaming changeTile to setTiles 2021-06-28 14:58:49 +02:00
David Négrier
319db95bc8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 
# Conflicts:
#	front/src/Api/iframe/room.ts
 2021-06-28 14:50:26 +02:00
David Négrier
0c5774a48f
Merge pull request #1229 from jonnytest1/cache-fix 
immutableData was never assigned
 2021-06-28 14:18:45 +02:00
GRL
ed84dacb9c Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-28 12:01:08 +02:00
GRL
b182a08ca2 correction from review 2021-06-28 09:33:13 +02:00
jonny
b0eb241fc3 oO something kept movin the comment to the next line 2021-06-25 18:45:15 +02:00
jonny
bbdf0a1289 fixed merge conflict 2021-06-25 18:20:16 +02:00
jonny
7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions 2021-06-25 18:14:40 +02:00
jonny
769e0fcc29 refactor to position object 2021-06-25 18:03:43 +02:00
jonny
c7fa5cab8b cleanup 2021-06-25 17:57:09 +02:00
jonny
f536d538ea added backwards compatible check and maps 2021-06-25 17:35:42 +02:00
_Bastler
c29ada18e9 formatting 2021-06-25 16:32:48 +02:00
Lurkars
7d12d8561a Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-06-25 16:13:26 +02:00
_Bastler
07b6fce877 re-adding popup-input, video container fix 2021-06-25 11:34:27 +02:00
Lurkars
4c8ee41cf2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 18:28:12 +02:00
_Bastler
0bb39a6a5d Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 18:28:04 +02:00
David Négrier
ac97cf5772 Fixing a lock when the player is moving from one room to the other 
This was due to a store not properly unsubscribed when changing rooms.
 2021-06-24 17:02:57 +02:00
Lurkars
d28f0bed50 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 15:43:06 +02:00
_Bastler
3cb877cee0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 15:42:47 +02:00
David Négrier
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides 
Fix collides
 2021-06-24 15:19:10 +02:00
Lurkars
116c56be81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 13:04:28 +02:00
_Bastler
f4d2897957 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 13:02:41 +02:00
kharhamel
a094e16c1f FIX: solved a menu crash 2021-06-24 12:14:28 +02:00
GRL
dcc7f2a686 Fix collides 2021-06-24 12:10:44 +02:00
GRL
c79603d7fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-24 11:55:07 +02:00
David Négrier
2f282e3469 peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files) 2021-06-24 11:54:09 +02:00
GRL
4903911d62 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-24 11:33:29 +02:00
GRL
a666bf310b Change Tiles 2021-06-24 11:31:29 +02:00
David Négrier
e4708149e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay 
# Conflicts:
#	front/package.json
#	front/src/Components/App.svelte
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Menu/MenuScene.ts
#	front/src/WebRtc/MediaManager.ts
 2021-06-24 10:49:55 +02:00
David Négrier
8d59680de5 Removing useless code 2021-06-24 10:36:47 +02:00
David Négrier
5ed61012f0 Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed" 2021-06-24 10:34:36 +02:00
_Bastler
ab20a074fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 09:47:16 +02:00
Lurkars
a0418ddb78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 09:19:55 +02:00
_Bastler
418dd4a6c5 merge dev 2021-06-24 08:56:29 +02:00
jonny
d1178b1a01 immutableData was never assigned 2021-06-23 20:19:38 +02:00
jonny
5472d220ba added trigger message code 2021-06-23 17:32:32 +02:00
David Négrier
0828dd8af3 Making max line length to 120 2021-06-23 16:58:57 +02:00
David Négrier
3f0ef2d31a Fixing prettier run command 2021-06-23 16:56:33 +02:00
David Négrier
f6d3783f6c Removing git add from lint-staged since it is not necessary since v10 2021-06-23 16:50:00 +02:00
David Négrier
ecbadda65a
Merge pull request #1224 from thecodingmachine/prettier 
Setting up prettier
 2021-06-23 16:34:21 +02:00
David Négrier
9f9cf5a3bb Fixing .gitignore files 2021-06-23 16:30:42 +02:00
David Négrier
4cac260f81 Adding prettier on back and pusher (not running them right now) 2021-06-23 16:23:16 +02:00
David Négrier
c0bfec7b11 Adding Prettier configuration 2021-06-23 15:51:31 +02:00
jonny
54d392be82 fixed not returnin null if parsed from url 2021-06-23 15:06:38 +02:00
GRL
95d8cf9257 Change requested 2021-06-23 14:54:06 +02:00
jonny
64847cd465 adjusted null if no hash 2021-06-23 12:42:24 +02:00
jonny
b20b4abb9e allow start hashes in tiles 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-06-23 12:37:50 +02:00
GRL
24cc340cb9 Merge branch 'metadataScriptingApi' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-23 12:02:29 +02:00
GRL
2a2cea2cd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-23 11:40:08 +02:00
GRL
bdb32a29e1 New methods refactored 2021-06-23 11:32:11 +02:00
David Négrier
b7934d9d03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into functional-tile-properties 2021-06-23 10:40:59 +02:00
David Négrier
bdc4b43c17 Setting up prettier 
In order not to wreak havoc on all the open PRs, Prettier will be added slowly,
on every changed file, thanks to Husky (for a precommit hook) and lint-staged, for linting only staged files.
 2021-06-23 10:10:53 +02:00
GRL
b50df10a49 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-23 09:25:13 +02:00
GRL
85fe92f604 Merge branch 'menu-commands-apiref' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-06-23 09:18:20 +02:00
David Négrier
ee07f637fa
Merge pull request #1219 from thecodingmachine/rex_outline 
Putting an outline on the character name
 2021-06-22 18:14:27 +02:00
David Négrier
1ef1a1cb22 Removing useless import 2021-06-22 17:47:54 +02:00
David Négrier
f1d00aac0e
Merge pull request #1211 from thecodingmachine/adminSvelte 
Migrating ConsoleGlobalMessageManager in svelte
 2021-06-22 17:28:37 +02:00
David Négrier
dc0f3feabf Putting an outline on the character name 
In the future, we might want to put an outline on the whole character body but this is harder as the body is actually a container and so we would need to turn this container into a sprite first.
 2021-06-22 17:15:18 +02:00
David Négrier
e9dd7ebdd9 Enabling Outline back on actionable objects 
Actionable objects (still a prototype) were outlined when you walk next to them.
The OutlinePipeline was broken when moving in Phaser 3.50+.

This PR completely removes the custom OutlinePipeline and replaces it with the rexOutlinePipelinePlugin
that is provided by a third party library and that works great \o/
 2021-06-22 16:35:57 +02:00
GRL
cec7087fc2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 16:28:45 +02:00
GRL
67d4c6e271 Resolve review 2021-06-22 16:12:53 +02:00
GRL
0728d462a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 16:08:06 +02:00
GRL
be23db5bcf Resolve import and LoadPageEvent issue 2021-06-22 16:07:31 +02:00
David Négrier
bdbd19c3da
Merge pull request #1216 from thecodingmachine/feature/animated-tiles 
Add animated Tiles plugin
 2021-06-22 15:32:55 +02:00
_Bastler
f82b106dce Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-22 14:26:47 +02:00
David Négrier
eb526f5b67 Upgrading animatedtiles plugin to trigger an event when an animation occurs and setting the scene to dirty state 2021-06-22 14:21:15 +02:00
GRL
ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
GRL
55d99b24f4 Correction form review and checks 2021-06-22 10:43:20 +02:00
GRL
0cc7ed1647 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 10:36:16 +02:00
GRL
4fedc30301 Correction form review and checks 2021-06-22 10:27:54 +02:00
GRL
da5ae02a06 Correction form review and checks 2021-06-22 10:22:49 +02:00
David Négrier
1283e86ce8 Adding test map for animated tiles 2021-06-22 10:22:48 +02:00
GRL
8a1c57c434 Correction form review and checks 2021-06-22 10:10:03 +02:00
GRL
267a0bbe4d Correction form review and checks 2021-06-22 09:49:04 +02:00
GRL
5cac4f52bc Correction form review and checks 2021-06-22 09:43:41 +02:00
jonny
8be29062f6 reverted import sorting 2021-06-21 18:41:41 +02:00