GRL
dad8cdef8b
Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI
2021-06-29 09:42:20 +02:00
_Bastler
e1fd474420
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-29 09:40:33 +02:00
GRL
65d1e4e768
Add CHANGELOG and a map for test
2021-06-29 09:40:15 +02:00
David Négrier
ec75509725
Merge pull request #839 from ValdoTR/new-favicon
...
Updated favicons
2021-06-29 09:03:15 +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
_Bastler
44791d113d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-29 07:52:33 +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
GRL
5c3a207c72
Merge branch 'cowebsiteAllowApibyScript' of github.com:thecodingmachine/workadventure into cowebsiteAllowApibyScript
2021-06-28 16:13:53 +02:00
GRL
06920a2271
Use dynamic Iframe API
2021-06-28 16:13:38 +02:00
GRL78
9ab73c0aa0
Update docs/maps/api-reference.md
...
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-06-28 16:05:29 +02:00
GRL
feab5da2ad
Allow a website opened by script to use iframe_api
2021-06-28 15:55:30 +02:00
David Négrier
49d627ca38
Merge pull request #1244 from thecodingmachine/warning_message_on_iframe_api
...
Adding a warning message if an unauthorized iFrame tries to communicate with WA
2021-06-28 15:24:55 +02: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
_Bastler
f13282f424
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-28 15:02:24 +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
David Négrier
71a5e29ae4
Making script URL dynamic
...
Signed-off-by: David Négrier <d.negrier@thecodingmachine.com>
2021-06-28 14:13:49 +02:00
David Négrier
86cb118378
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 14:12:10 +02:00
David Négrier
46ae4fda74
Merge pull request #1242 from thecodingmachine/iframe_load_url
...
Trying to find iframe_api.js URL script dynamically
2021-06-28 14:10:32 +02:00
David Négrier
303d2a7837
Adding a warning regarding the "controlled" XSS in iframe.html
2021-06-28 13:55:17 +02:00
David Négrier
7f79c2dc4a
Making the test page URL dynamic depending on the environment
2021-06-28 13:54:49 +02:00
GRL
d38cec0b51
Merge branch 'metadataScriptAPIV2' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 13:48:44 +02:00
GRL
651b0a4518
Add test map for changing tiles by script in index
2021-06-28 12:03:06 +02:00
GRL
ed84dacb9c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 12:01:08 +02:00
David Négrier
330a795fee
Trying to find iframe_api.js URL script dynamically
...
This would allow us to have tests that don't rely on the iframe_api.js from prod, and would allow scripts that target the correct iframe API, no matter if they are running on workadventu.re or on self-hosted maps.
2021-06-28 11:51:13 +02:00
jonny
917f3728d5
added callback in example
2021-06-28 11:17:22 +02:00
jonny
9643c7adf9
added callback documentation
2021-06-28 11:16:29 +02:00
David Négrier
f18291e9d2
Referencing test in index.html and adding some text in the test map.
2021-06-28 10:06:56 +02:00
David Négrier
0b161a2368
Fixing typos
2021-06-28 09:56:18 +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
abfa010bbf
added husky to gitignore
2021-06-25 18:07:03 +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
_Bastler
c29ada18e9
formatting
2021-06-25 16:32:48 +02:00
Lurkars
7d12d8561a
Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements
2021-06-25 16:13:26 +02:00
_Bastler
07b6fce877
re-adding popup-input, video container fix
2021-06-25 11:34:27 +02:00
Lurkars
4c8ee41cf2
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2021-06-24 18:28:12 +02:00
_Bastler
0bb39a6a5d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 18:28:04 +02:00
David Négrier
63d4c99d15
Merge pull request #1235 from thecodingmachine/fix_map_change
...
Fixing a lock when the player is moving from one room to the other
2021-06-24 17:08:06 +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
