lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
3004 commits 21 branches 1 tag 50 MiB
Commit graph

1760 commits

Author SHA1 Message Date
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
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
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
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
Gregoire Parant 4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Lurkars 7d12d8561a Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-06-25 16:13:26 +02:00
Lurkars 4c8ee41cf2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 18:28:12 +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
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
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
Lurkars a0418ddb78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 09:19:55 +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
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
jonny 64a00481f0 fixed wrong import 2021-06-21 18:39:02 +02:00
jonny ba1bcf226a menu command api 2021-06-21 18:22:31 +02:00
kharhamel 42c0d1002f FIX: no more whitespaces in player names 2021-06-21 17:58:04 +02:00
David Négrier e4dab5fd0d Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/animated-tiles 
# Conflicts:
#	front/package.json
#	front/tsconfig.json
#	front/yarn.lock
 2021-06-21 17:26:00 +02:00
GRL 232fd33ec8 Migrating ConsoleGlobalMessageManager in svelte 2021-06-21 17:19:27 +02:00
David Négrier b59cbcac4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay 
# Conflicts:
#	front/package.json
 2021-06-21 14:54:32 +02:00
David Négrier cddade059f Removing commented code 2021-06-21 14:49:41 +02:00
David Négrier a08f6a33ac Improving naming 2021-06-21 14:43:10 +02:00
David Négrier 77a4d23301 Renaming biggestAvailableArray to biggestAvailableArea + removing duplicated code. 2021-06-21 14:07:03 +02:00
David Négrier 6101548d89 Fixing bug where only one chat listener can be added. 2021-06-21 13:47:07 +02:00
David Négrier 620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier ce0a52c227 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor2 
# Conflicts:
#	front/package-lock.json
 2021-06-21 11:53:07 +02:00
David Négrier 9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +02:00
jonny 7716fe4b62 run templater on running start script 2021-06-20 19:26:35 +02:00
jonny 5bf943ce77 converted cache to constant lookup time 2021-06-20 19:14:04 +02:00
jonny 92485a02cf tileIndex setting got merged out 2021-06-19 15:46:32 +02:00
jonny c1d9b2c9ed coverted property map to object 2021-06-19 15:41:58 +02:00
jonny 27ccdf165c fixed merge imports 2021-06-19 15:24:27 +02:00
jonny 74dda8ab69 allow properties on tiles 
# Conflicts:
#	front/src/Phaser/Game/GameMap.ts
#	front/src/Phaser/Map/ITiledMap.ts
 2021-06-19 15:23:30 +02:00
David Négrier 34dc5a0bc6 Refactoring WorkAdventureAPI. 
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
 2021-06-18 17:22:56 +02:00
jonny 0690f088b6 setup to also run on windows 2021-06-18 00:21:54 +02:00
David Négrier 227575043b Removing dead code 2021-06-17 18:56:30 +02:00
David Négrier 4ec92ddf58 Adding new icons for the change layout button 2021-06-17 18:30:08 +02:00
jonny 702f4fe4c0 converted goToRoom to typed call 2021-06-17 11:32:59 +02:00
jonny 318749e5a8 develop merge 2021-06-17 11:30:16 +02:00
David Négrier f6554a1082 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor 
# Conflicts:
#	front/src/iframe_api.ts
 2021-06-17 11:23:56 +02:00
David Négrier d6ec0d22d3 Code cleanup 2021-06-17 10:35:08 +02:00
David Négrier d533894a74 Fixing warnings and moving biggest area compute in store 2021-06-17 10:13:23 +02:00
David Négrier d3544e2d97 Ignoring "no tracks" warning (cause really, we cannot add tracks to live streams) 2021-06-17 10:07:27 +02:00
David Négrier d888b694cc Adding button to change layout 2021-06-17 10:07:27 +02:00
David Négrier 3b278d0498 Removing dead code 2021-06-17 10:07:27 +02:00
David Négrier 76261de805 Enabling back the open report feature 2021-06-17 10:07:27 +02:00
David Négrier ca56a78814 Limiting the max height of video elements 2021-06-17 10:07:27 +02:00
David Négrier 5cf5e0ce2b Changing the way we focus a video element. 
Now, only one video element can be important.
 2021-06-17 10:07:27 +02:00