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
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
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
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
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
7f61e9addd
Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions
2021-06-25 18:14:40 +02:00
jonny
f536d538ea
added backwards compatible check and maps
2021-06-25 17:35:42 +02:00
GRL
a666bf310b
Change Tiles
2021-06-24 11:31:29 +02:00
jonny
5472d220ba
added trigger message code
2021-06-23 17:32:32 +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
dependabot[bot]
7697ed053e
Bump glob-parent from 5.1.1 to 5.1.2 in /maps
...
Bumps [glob-parent](https://github.com/gulpjs/glob-parent ) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases )
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md )
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2 )
---
updated-dependencies:
- dependency-name: glob-parent
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 12:05:43 +00: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
David Négrier
870f16f9c6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript
2021-05-26 16:15:33 +02:00
David Négrier
fac6574cb5
Removing console.log and unused files
2021-05-26 16:08:43 +02:00
David Négrier
1bf4475e1b
Merge pull request #1023 from thecodingmachine/dependabot/npm_and_yarn/maps/hosted-git-info-2.8.9
...
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps
2021-05-26 15:49:17 +02:00
GRL
17261dfab6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-26 10:58:25 +02:00
David Négrier
4d18e0ceb4
Removing parsing of TSX files in "maps" container
...
The TSX extension is used by Typescript (for JSX like files) but ALSO by Tiled (for tilesets).
We don't need the Typescript TSX files so this PR is preventing Typescript from parsing those files in the "maps" container.
2021-05-25 10:43:01 +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
ab7b06f71e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-11 09:44:53 +02:00
dependabot[bot]
25d1e575ef
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps
...
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info ) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases )
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md )
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 16:57:45 +00:00
David Négrier
954b87db41
Merge pull request #1002 from thecodingmachine/dependabot/npm_and_yarn/maps/lodash-4.17.21
...
Bump lodash from 4.17.20 to 4.17.21 in /maps
2021-05-10 18:57:16 +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
dependabot[bot]
9c620de649
Bump lodash from 4.17.20 to 4.17.21 in /maps
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 13:45:25 +00:00
David Négrier
66490c9083
Adding test map to test energy consumption
2021-05-06 16:31:39 +02:00
Gregoire Parant
1440faf825
Merge branch 'master' into develop
2021-05-06 00:57:55 +02:00
grégoire parant
46978d26f9
Add entry map village WorkAdventure ( #997 )
2021-05-06 00:53:04 +02:00
David Négrier
f085393730
Merge pull request #992 from tabascoeye/patch-2
...
getting rid of special char in filename
2021-05-05 18:34:46 +02:00
David Négrier
c1be97e366
Adding test cases for mobile
2021-05-05 16:18:37 +02:00
grégoire parant
71eb3f3b69
Improvement feature circle discussion ( #977 )
...
* Improvment circle discussion
- Change to lissen start event of WebRTC connection
* Update help allow navigator and waring message
- Show warning message.
- Use help camera allow setting to show modal and help user.
- Change feature to show the modal only when user have need the information on allow navigator access
* Create soud for video discussion
2021-05-05 01:49:04 +02:00
TabascoEye
8d45338044
re-upload without accent in filename
2021-05-04 13:50:07 +02:00
TabascoEye
2b30bea3e0
Delete sol_intérieur.png
2021-05-04 13:49:32 +02:00
TabascoEye
ec02b11b7f
remove accent from filename
2021-05-04 13:48:20 +02:00
grégoire parant
622e0c6130
Add WA logo in village map ( #989 )
2021-05-04 12:39:00 +02:00
grégoire parant
95ec5dc3f6
Merge pull request #917 from ClementVieilly75/MapWA_Feature
...
Map village with new WA Office and features presented
2021-05-03 20:12:33 +02:00
jonny
99bd9d88d9
renamed api method "exitSceneTo"
2021-04-29 10:56:56 +02:00
jonny
99926a89b2
added goToPage.json with the loadPAge Api call to the index.html
2021-04-29 10:55:01 +02:00
jonny
8f1aea1c43
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
2021-04-29 10:49:14 +02:00
jonny
8f6c65384a
added example script for map exit
2021-04-29 10:43:51 +02:00
kharhamel
fe27169745
solved conflict with develop
2021-04-29 10:31:16 +02:00
Gregoire Parant
16397fe978
Merge branch 'master' into develop
2021-04-27 23:59:25 +02:00
grégoire parant
9b69910cb8
WIP: Update style for mobile ( #942 )
...
* Update style for mobile
- Update style for mobile modale
* Fix overscroll
* Change css properties overflow
* Revert "Change css properties overflow"
This reverts commit 612fcc7e007fb03c7f72e5fa4b8a0604a184ae7d.
* rm image
* Update view mobile
* Fix CI
2021-04-27 23:58:33 +02:00
GRL78
57194fd0a1
Add maps for test ( #915 )
2021-04-27 23:45:28 +02:00
David Négrier
22cb41dc29
Adding the ability to display "Text" objects from Tiled
...
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.
However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.
This PR adds the ability to display this text.
Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
2021-04-26 11:28:13 +02:00
David Négrier
6815fe7a0a
Added a new LayersIterator class
...
This class iterates recursively over layers, flattening groups.
This enables us to simplify the code when we iterate layers. We can remove all recursive function calls in the GameScene code (it is delegated to the LayersIterator)
2021-04-26 11:21:34 +02:00
DESKTOP-FMM8UI0\CLV
b79d76fc2e
parameter soundConfig is now optionnal
...
if user call mySound.play() the sound will be played with the base SoundConfig
2021-04-23 17:03:17 +02:00
DESKTOP-FMM8UI0\CLV
f8bab9ce6b
Map Village with all the tilesSets
2021-04-23 15:39:45 +02:00
DESKTOP-FMM8UI0\CLV
f03f8076f3
Sound in Script Done
...
Fom script user can load, play and stop sound
2021-04-23 15:35:34 +02:00
DESKTOP-FMM8UI0\CLV
517c0e86cb
Can play Sound from a map script
...
add sound in the TutoMap
2021-04-21 16:47:19 +02:00
DESKTOP-FMM8UI0\CLV
676dbcc9d0
Map village with new WA Office and features presented
2021-04-20 16:56:48 +02:00
DESKTOP-FMM8UI0\CLV
b9d9a78868
Link changed in Tutov3
...
Change position of cam and buttons share/cam/Mic
2021-04-19 14:42:49 +02:00
David Négrier
94317be1ae
Improving test cases
...
This PR improves test cases by adding a "index.html" webpage listing test maps
and by adding text in the map, explaining what needs to be tested.
2021-04-17 21:31:09 +02:00
David Négrier
16daf7332a
Adding the ability to display "Text" objects from Tiled
...
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.
However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.
This PR adds the ability to display this text.
Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
2021-04-17 12:05:54 +02:00
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup
2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
8720354c87
exit Url changed : tcm/workadventure/floor0
2021-04-09 16:39:37 +02:00
