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

92 commits

Author SHA1 Message Date
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 ae5617f3a0 Simplifying promises 2021-07-22 10:41:45 +02:00
Valdo Romao cd49fd5b83 Fixe openPopup deprecated annotation 2021-07-21 16:10:30 +02:00
David Négrier b1cb12861f Migrating variables functions to the "state" namespace. 2021-07-07 22:14:59 +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
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
David Négrier ea1460abaf Adding variables (on the front side for now) 2021-07-02 17:36:43 +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 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
GRL 389ca25b6a Cowebsite opened by script can use Iframe Api 2021-06-28 18:00:48 +02:00
jonny 7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions 2021-06-25 18:14:40 +02:00
GRL 24cc340cb9 Merge branch 'metadataScriptingApi' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-23 12:02:29 +02:00
GRL bdb32a29e1 New methods refactored 2021-06-23 11:32:11 +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
David Négrier 620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier 9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +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 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
jonny c1e202b7b1 renamed to goToRoom 2021-06-16 17:16:00 +02:00
jonny 7712bd685b fixed merge errors 2021-06-15 15:19:45 +02:00
jonny 238f333b81 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
 2021-06-15 15:05:49 +02:00
jonny ed39043bbe this should make one file only 2021-05-28 13:10:30 +02:00
jonny 8a1376e966 refactored to key based types 2021-05-28 02:28:11 +02:00
jonny dbb35d102f extracted giant typing block 2021-05-28 01:59:43 +02:00
jonny 9e6fb755d9 added javascript for setting commands 2021-05-28 01:44:38 +02:00
jonny fd5b598b63 Bubble [WIP] (still need to do the javascript part) 2021-05-28 01:18:00 +02:00
jonny 540e5783b6 cowebsite 
navigation
sound
player
extraction
 2021-05-28 01:14:10 +02:00
jonny ea04dd5303 Merge branch 'iframe-api-refactor' of github.com:jonnytest1/workadventure into iframe-api-refactor 2021-05-28 00:58:11 +02:00
jonny 6a90655c44 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into iframe-api-refactor 2021-05-28 00:52:42 +02:00
jonnytest1 b35207a578
Merge branch 'develop' into iframe-api-refactor 2021-05-28 00:38:12 +02:00
jonny cbe93d7164 [WIP] fixed cherry pick conflicts 2021-05-28 00:34:40 +02:00
jonny 2de2d114a1 added typedef for subobject types 
extracted popup functions

# Conflicts:
#	front/package-lock.json
#	front/package.json
#	front/src/iframe_api.ts
 2021-05-28 00:30:51 +02:00
jonny 1a1ab30574 extraction idea 
# Conflicts:
#	front/src/Api/ScriptUtils.ts
#	front/src/iframe_api.ts
 2021-05-28 00:29:21 +02:00
GRL 6dcb0d3750 first step to change tile 2021-05-27 17:06:39 +02:00
GRL 9cd3ff1d31 Merge branch 'correct-merge' into metadataScriptAPIV2 2021-05-27 10:16:00 +02:00
GRL acbe4f89a6 Merge branch 'update-game-tiles' into correct-merge 2021-05-27 09:45:25 +02:00
GRL 5565ddd3f4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 17:22:37 +02:00
David Négrier fac6574cb5 Removing console.log and unused files 2021-05-26 16:08:43 +02:00
GRL c8e2416e08 documentation of getCurrentUser, getCurrentRoom and on working with group layer 2021-05-26 10:41:33 +02:00
GRL a5cb93541a correction from code review 2021-05-25 17:21:02 +02:00
GRL d4bc999c54 pause loading tileset on fly 2021-05-25 10:15:56 +02:00
DESKTOP-FMM8UI0\CLV 0c3b9ccfbf Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript 
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
#	maps/Tuto/scriptTuto.js
#	maps/Village/Village.json
 2021-05-21 17:45:26 +02:00
GRL 1110f4fb7f Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" 
This reverts commit 796a9418d3, reversing
changes made to 3506063e65.
 2021-05-21 16:24:48 +02:00
GRL 796a9418d3 Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-21 15:56:35 +02:00