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
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
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
David Négrier
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides
...
Fix collides
2021-06-24 15:19:10 +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
jonny
d1178b1a01
immutableData was never assigned
2021-06-23 20:19:38 +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
