b35207a578
Merge branch 'develop' into iframe-api-refactor
2021-05-28 00:38:12 +02:00
cbe93d7164
[WIP] fixed cherry pick conflicts
2021-05-28 00:34:40 +02:00
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
1a1ab30574
extraction idea
...
# Conflicts:
# front/src/Api/ScriptUtils.ts
# front/src/iframe_api.ts
2021-05-28 00:29:21 +02:00
5d8d729bd7
Uncommenting action
2021-05-27 18:25:27 +02:00
6dcb0d3750
first step to change tile
2021-05-27 17:06:39 +02:00
9cd3ff1d31
Merge branch 'correct-merge' into metadataScriptAPIV2
2021-05-27 10:16:00 +02:00
acbe4f89a6
Merge branch 'update-game-tiles' into correct-merge
2021-05-27 09:45:25 +02:00
5565ddd3f4
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-26 17:22:37 +02:00
870f16f9c6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript
2021-05-26 16:15:33 +02:00
54e300443b
Fixing Typing
2021-05-26 16:11:22 +02:00
fac6574cb5
Removing console.log and unused files
2021-05-26 16:08:43 +02:00
4f1cab5afe
Fixing comments
2021-05-26 12:19:58 +02:00
4c4f310b79
The share screen button is now displayed only when screen sharing makes sense.
...
Also, fixed the button not aligned bug
2021-05-26 12:12:47 +02:00
dd428bc1e1
Migrating screen sharing to using a store
2021-05-26 12:12:47 +02:00
d32df13f1b
Camera now show up when someone is moving and hides 5 seconds after we stop moving.
...
Also, added an animation to show/hide the webcam.
2021-05-26 12:12:46 +02:00
8af8ccd54b
Migrating MediaManager game part to Svelte store
2021-05-26 12:12:18 +02:00
28d78a7988
Switching MediaManager to using a Svelte store
...
This allows cleaner and more expressive code, especially regarding whether the webcam should be on or off.
2021-05-26 12:11:16 +02:00
4f4d2532b7
Merge pull request #1082 from thecodingmachine/disabling_physics_optim
...
Moving Physics optim to DirtyScene
2021-05-26 12:08:57 +02:00
bc19cbd525
Moving Physics optim to DirtyScene
...
The Physics engine is now disabled only if no sprites are moving (if they have no velocity).
Also, if a sprite is moving (if it has a velocity), the dirty state is set.
2021-05-26 12:00:27 +02:00
17261dfab6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-26 10:58:25 +02:00
c8e2416e08
documentation of getCurrentUser, getCurrentRoom and on working with group layer
2021-05-26 10:41:33 +02:00
b4fa38bf8c
Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi
2021-05-25 17:21:12 +02:00
a5cb93541a
correction from code review
2021-05-25 17:21:02 +02:00
595c5ca64d
now use custom emotes with tweens instead of transistions
2021-05-25 16:37:24 +02:00
7c44d747de
Apply suggestions from code review
...
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com >
2021-05-25 11:02:25 +02:00
d4bc999c54
pause loading tileset on fly
2021-05-25 10:15:56 +02:00
36f0cd1a23
Revert "pause for loading tileset on the fly"
...
This reverts commit a3165a0540
2021-05-25 10:11:27 +02:00
343ad6ea96
Revert "preparation for merge with metadataScriptApi"
...
This reverts commit b18b2fe0e3
2021-05-25 10:11:25 +02:00
a7b09e91ba
Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"
...
This reverts commit 428625e61ba3165a0540
2021-05-25 10:09:58 +02:00
428625e61b
Merge branch 'update-game-tiles' into metadataScriptingApi
2021-05-25 09:54:00 +02:00
b18b2fe0e3
preparation for merge with metadataScriptApi
2021-05-25 09:50:59 +02:00
a3165a0540
pause for loading tileset on the fly
2021-05-25 09:39:04 +02:00
d0aaa0620d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-25 09:24:26 +02:00
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
1110f4fb7f
Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"
...
This reverts commit 796a9418d33506063e65
2021-05-21 16:24:48 +02:00
796a9418d3
Merge branch 'update-game-tiles' into metadataScriptingApi
2021-05-21 15:56:35 +02:00
3506063e65
first step on loading a tileset from a script
2021-05-20 17:09:10 +02:00
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
d93b30f982
improved radial menu
2021-05-19 18:11:51 +02:00
35b37a6a88
Added a radial menu to run emotes
2021-05-19 15:17:50 +02:00
a1d52b4265
FEATURE: added the possibility toplay emotes
2021-05-19 15:17:03 +02:00
ce0a72c6ce
Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi
2021-05-19 09:36:11 +02:00
b509471140
documentation
...
documentation of onPlayerMove
documentation of getMap
documentation of getGameState
2021-05-18 17:05:16 +02:00
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
201fcf6afa
Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi
2021-05-18 15:18:35 +02:00
2ee62c9e9e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-18 11:50:03 +02:00
20ec609535
FIX: rejected map axios promises are now catched
2021-05-18 11:45:07 +02:00
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
2ea731beeb
Merge pull request #1057 from thecodingmachine/physics_flag
...
Making sure Physics is not enabled several times
2021-05-18 10:26:32 +02:00
jonnytest1