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

95 commits

Author SHA1 Message Date
GRL 95d8cf9257 Change requested 2021-06-23 14:54:06 +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 be23db5bcf Resolve import and LoadPageEvent issue 2021-06-22 16:07:31 +02:00
GRL ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
jonny 64a00481f0 fixed wrong import 2021-06-21 18:39:02 +02:00
jonny ba1bcf226a menu command api 2021-06-21 18:22:31 +02:00
David Négrier 6101548d89 Fixing bug where only one chat listener can be added. 2021-06-21 13:47:07 +02:00
David Négrier 620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier 9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +02:00
David Négrier 34dc5a0bc6 Refactoring WorkAdventureAPI. 
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
 2021-06-18 17:22:56 +02:00
jonny 702f4fe4c0 converted goToRoom to typed call 2021-06-17 11:32:59 +02:00
jonny 318749e5a8 develop merge 2021-06-17 11:30:16 +02:00
David Négrier f6554a1082 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor 
# Conflicts:
#	front/src/iframe_api.ts
 2021-06-17 11:23:56 +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
David Négrier b03ee5bd53 Fixing scripting origin check 
When working on making the openCoWebsite URL relative, we introduced a regression.
In production, the iframe generated by "script" properties have no "src" and therefore, were treated as invalid messages.

This should fix everything in prod.
 2021-06-07 16:48:52 +02:00
jonny dab3f1f844 removed zoned popups 2021-06-03 22:01:42 +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
jonny 8a1376e966 refactored to key based types 2021-05-28 02:28:11 +02:00
jonny 5fd82c1188 minor cleanup 2021-05-28 01:50:58 +02:00
jonny ab631c5dc4 register callbacks 
should be done now
 2021-05-28 01:46:08 +02:00
jonny fd5b598b63 Bubble [WIP] (still need to do the javascript part) 2021-05-28 01:18:00 +02:00
jonny 540e5783b6 cowebsite 
navigation
sound
player
extraction
 2021-05-28 01:14:10 +02:00
jonny 6a90655c44 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into iframe-api-refactor 2021-05-28 00:52:42 +02:00
jonny cbe93d7164 [WIP] fixed cherry pick conflicts 2021-05-28 00:34:40 +02:00
jonny 2de2d114a1 added typedef for subobject types 
extracted popup functions

# Conflicts:
#	front/package-lock.json
#	front/package.json
#	front/src/iframe_api.ts
 2021-05-28 00:30:51 +02:00
jonny 1a1ab30574 extraction idea 
# Conflicts:
#	front/src/Api/ScriptUtils.ts
#	front/src/iframe_api.ts
 2021-05-28 00:29:21 +02:00
GRL 5565ddd3f4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 17:22:37 +02:00
David Négrier 54e300443b Fixing Typing 2021-05-26 16:11:22 +02:00
GRL b4fa38bf8c Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-25 17:21:12 +02:00
GRL a5cb93541a correction from code review 2021-05-25 17:21:02 +02:00
GRL78 7c44d747de
Apply suggestions from code review 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-05-25 11:02:25 +02:00
GRL d4bc999c54 pause loading tileset on fly 2021-05-25 10:15:56 +02:00
GRL 343ad6ea96 Revert "preparation for merge with metadataScriptApi" 
This reverts commit b18b2fe0e3.
 2021-05-25 10:11:25 +02:00
GRL a7b09e91ba Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" 
This reverts commit 428625e61b, reversing
changes made to a3165a0540.
 2021-05-25 10:09:58 +02:00
GRL 428625e61b Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-25 09:54:00 +02:00
GRL b18b2fe0e3 preparation for merge with metadataScriptApi 2021-05-25 09:50:59 +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 1110f4fb7f Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" 
This reverts commit 796a9418d3, reversing
changes made to 3506063e65.
 2021-05-21 16:24:48 +02:00
GRL 796a9418d3 Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-21 15:56:35 +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 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 2ee62c9e9e Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-18 11:50:03 +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
David Négrier 127a4759ac Merge branch 'develop' of github.com:thecodingmachine/workadventure into menu-command-api 
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
 2021-05-18 10:16:44 +02:00
David Négrier 9b68faac0e
Fixing JSDoc 2021-05-18 09:53:54 +02:00
David Négrier fe573893a1
Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues 
Setting "importsNotUsedAsValues": "error"
 2021-05-13 19:43:34 +02:00