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

85 commits

Author SHA1 Message Date
GRL 01d02124d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-07-01 11:38:33 +02:00
David Négrier 8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
GRL 389ca25b6a Cowebsite opened by script can use Iframe Api 2021-06-28 18:00:48 +02:00
David Négrier 1e57028e6e Renaming changeTile to setTiles 2021-06-28 14:58:49 +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 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
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
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
GRL a666bf310b Change Tiles 2021-06-24 11:31:29 +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
GRL 85fe92f604 Merge branch 'menu-commands-apiref' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-06-23 09:18:20 +02:00
GRL cec7087fc2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 16:28:45 +02:00
GRL ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
David Négrier 1283e86ce8 Adding test map for animated tiles 2021-06-22 10:22:48 +02:00
David Négrier be2aa62efc Adding tests for deprecated and moved functions 2021-06-18 18:29:45 +02:00
jonny 1147a21dde fixed documentation 2021-06-16 17:34:00 +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
GRL 10e40930e2 Adding map test helpCameraSetting 2021-06-01 11:52:19 +02:00
GRL 8f21ea8385 suppression last line of loadtileset 2021-05-28 14:33:16 +02:00
GRL 858a513569 correction of adding custom menu 
correction of setProperty
updating CHANGELOG
updating api-reference
 2021-05-28 12:13:10 +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
GRL e1f0192e61 Adding and updating test map for metadata 2021-05-26 17:18:38 +02:00
David Négrier 9aed9713c8 Referencing sound test in index.html 2021-05-26 16:22:58 +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 3506063e65 first step on loading a tileset from a script 2021-05-20 17:09:10 +02:00
GRL 2f9cc393a7 Implementation of getTag of the current user 
documentation of getTag
Adding map for test of getTag
 2021-05-20 10:57:36 +02:00
GRL 96545c618a Adding maps for test metadata 
Documentation of metadata functions/methods
 2021-05-20 08:58:05 +02:00
GRL ce0a72c6ce Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-19 09:36:11 +02:00
GRL aa78bf44ef implementation of DataLayerEvent 
update GetGameState to add nickname to the returned data
update GameMap to separate phaserLayer and mapLayer
 2021-05-18 15:41:16 +02:00
GRL 201fcf6afa Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-18 15:18:35 +02:00
GRL 3edfd5b285 GameState is now save in cache 
HasPlayerMoved is send when the player is actually moving on the map every 200ms.
 2021-05-18 11:33:16 +02:00
GRL 43aad4ab14 phaserLayers managed by Gamemap 
Implementation of LayersFlattener
Implementation of Setting properties of a layer form script
Update show/hide layer form script
Update unit test of LayersIteratorTest
 2021-05-12 14:30:12 +02:00
GRL 973b3405ef documentation of show/hide layer 2021-05-10 15:10:11 +02:00
GRL fd931c4884 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 14:45:41 +02:00
GRL 8edd29abaa suppression console.log 2021-05-10 14:43:00 +02:00
David Négrier c025d1798b Renaming restorePlayerControls/disablePlayerControls 
Putting "controls" in the plural form:

- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
 2021-05-10 12:18:06 +02:00
GRL cd2d090a8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 11:46:16 +02:00
GRL a6ba8d41b9 implement show/hide layer with scripting 2021-05-10 11:19:18 +02:00
jonny a5260c0831 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 2021-05-10 09:58:59 +02:00
David Négrier 66490c9083 Adding test map to test energy consumption 2021-05-06 16:31:39 +02:00
David Négrier c1be97e366 Adding test cases for mobile 2021-05-05 16:18:37 +02:00