Commit Graph

3275 Commits

Author SHA1 Message Date
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
e5f7c62e25
Merge pull request #1263 from thecodingmachine/blacklistOnUuid
Users blocking now rely on UUID rather than ID
2021-07-07 11:33:12 +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
28e4f59e50
Merge pull request #1262 from thecodingmachine/players_store
Adding a playersStore
2021-07-06 17:21:42 +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
a1f1927b6d Starting adding variables server-side 2021-07-06 15:30:49 +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
194d6a6414
Merge pull request #1254 from jonnytest1/server-crash
fixed invalid unauathorized handler
2021-07-05 14:42:20 +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
1806ef9d7e First version of the room metadata doc 2021-07-02 17:30:42 +02:00
David Négrier
a7ced533c0
Merge pull request #1258 from thecodingmachine/query-answer-mechanism
Add new "query/answer" utility functions for the scripting API
2021-07-02 17:29:41 +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
David Négrier
d29c0cc99f
Merge pull request #1257 from thecodingmachine/jonnytest1-tiles-start-positions
Merging Jonnytest1's PR tiles-start-positions + Correction of metadata function
2021-07-02 15:12:23 +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
jonny
65cefb3584 fixed invalid unauathorized handler 2021-07-01 15:50:40 +02:00
Lurkars
bba26fdc20 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-07-01 13:39:04 +02:00
David Négrier
63391e657f
Merge pull request #1221 from thecodingmachine/metadataScriptAPIV2
Change Tile with scripting API
2021-07-01 12:04:16 +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
a7d2c600ff Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-06-30 13:35:29 +02:00
David Négrier
50fcc1caaa Fixing signature of openCoWebSite 2021-06-30 10:40:53 +02:00
David Négrier
164f88ef4c
Merge pull request #1250 from thecodingmachine/fix_push_to_npm
Fixing NPM package generation
2021-06-30 10:21:04 +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
cb2485bab0
Merge pull request #1248 from thecodingmachine/master_backport
Backporting master into develop
2021-06-29 18:50:54 +02:00
David Négrier
8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
David Négrier
33ee190b0f
Merge pull request #1246 from thecodingmachine/OpenWebSiteScriptAllowAPI
Cowebsite opened by script can use Iframe Api
2021-06-29 18:27:54 +02:00
David Négrier
3c77ce945d
Improving docs 2021-06-29 18:26:21 +02:00
David Négrier
c5949a0337 Fixing linting 2021-06-29 17:57:19 +02:00
David Négrier
ef0d422a49 Fixing building of typings 2021-06-29 17:55:19 +02:00
David Négrier
285712bfc7 Fixing building of typings 2021-06-29 17:31:01 +02:00
David Négrier
1cd18db560 Fixing broken NPM typings package build 2021-06-29 16:59:54 +02:00
GRL
95bd639124 More statement 2021-06-29 16:50:33 +02:00