Commit Graph

201 Commits

Author SHA1 Message Date
_Bastler cf69b3259a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 08:17:37 +02:00
David Négrier f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
_Bastler 4913010273 fix drinks 2021-09-06 20:15:41 +02:00
_Bastler 64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00
kharhamel 4160235b92 ran pretty on the front 2021-09-06 14:31:59 +02:00
_Bastler a633f79dd7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 20:19:30 +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 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
_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
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
GRL ad95fa5e11 Execute scripts of the map after creating gameScene 2021-08-23 18:53:59 +02:00
GRL edfe440c6e Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-20 16:18:45 +02:00
_Bastler 6ff4f4f52e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-19 10:36:23 +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
_Bastler fc567e76f4 update dependencies, Iframe module loading 2021-08-17 20:33:20 +02:00
GRL f4ce5f9a3b Merge branch 'ReportMenuSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-11 15:04:47 +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 27d331ea37 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-10 10:25:24 +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 6b9b999996 Making embedded iframes scriptable using the WA.room.website namespace. 2021-08-05 12:37:05 +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 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
_Bastler d046460d76 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-04 18:02:49 +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 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
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
David Négrier cdd61bdb2c Merging with develop 2021-07-23 16:41:38 +02:00
David Négrier 3d5c222957 Reverting changes regarding single quotes 2021-07-23 14:59:56 +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
_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
_Bastler b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier 080d495044 Renaming WA.room.getMap to WA.room.getTiledMap 2021-07-21 16:40:53 +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 3e60042164 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:38 +02:00
GRL78 b2ea368097 Migrate getCurrentUser() to WA.player (#1279) 2021-07-13 15:13:14 +02:00
David Négrier 52fd9067b8 Editing do to add "state" API doc 2021-07-08 11:46:30 +02:00