GRL
858a513569
correction of adding custom menu
...
correction of setProperty
updating CHANGELOG
updating api-reference
2021-05-28 12:13:10 +02:00
David Négrier
5d8d729bd7
Uncommenting action
2021-05-27 18:25:27 +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
_Bastler
05e18e0568
merge betterNameText
2021-05-26 20:31:33 +02:00
_Bastler
7bdbc191b5
merge latest dev
2021-05-26 19:14:18 +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
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
8af8ccd54b
Migrating MediaManager game part to Svelte store
2021-05-26 12:12:18 +02:00
David Négrier
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
David Négrier
4f4d2532b7
Merge pull request #1082 from thecodingmachine/disabling_physics_optim
...
Moving Physics optim to DirtyScene
2021-05-26 12:08:57 +02:00
David Négrier
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
GRL
17261dfab6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-26 10:58:25 +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
kharhamel
595c5ca64d
now use custom emotes with tweens instead of transistions
2021-05-25 16:37:24 +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
36f0cd1a23
Revert "pause for loading tileset on the fly"
...
This reverts commit a3165a0540
.
2021-05-25 10:11:27 +02:00
GRL
a3165a0540
pause for loading tileset on the fly
2021-05-25 09:39:04 +02:00
GRL
d0aaa0620d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-25 09:24:26 +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
kharhamel
d93b30f982
improved radial menu
2021-05-19 18:11:51 +02:00
kharhamel
35b37a6a88
Added a radial menu to run emotes
2021-05-19 15:17:50 +02:00
kharhamel
a1d52b4265
FEATURE: added the possibility toplay emotes
2021-05-19 15:17:03 +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
_Bastler
5538a511c7
merge latest dev
2021-05-18 15:04:35 +02:00
GRL
2ee62c9e9e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-18 11:50:03 +02:00
kharhamel
20ec609535
FIX: rejected map axios promises are now catched
2021-05-18 11:45:07 +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
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
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
_Bastler
d133bf17ea
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-05-18 09:54:08 +02:00
David Négrier
6128f1e431
Making sure Physics is not enabled several times
...
As part of an energy saving measure, we started disabling physics when the character is not moving and enabling physics again only when the character moves.
However, we enabled Physics on each frame the characeter was moving.
As a result, the Physics system would run several times, slowly slowing the computer down.
This fixes this issue by adding a flag to only enable Physics once.
2021-05-18 09:42:01 +02:00
David Négrier
24dfa2703d
Set a global dirty flag on resize
...
This adds a global "Dirty" flag at the Game level and sets it each time the ScaleManager is modified.
This fixes a bug where the game was not redrawn when a CoWebsite was opening/closing.
2021-05-18 09:20:38 +02:00
_Bastler
777987600f
update
2021-05-18 07:58:47 +02:00
_Bastler
d03f277061
Merge branch 'develop' of github.com:thecodingmachine/workadventure into dev_main_merge
2021-05-17 15:25:11 +02:00
_Bastler
16aa859844
merge develop into main
2021-05-17 14:49:18 +02:00
kharhamel
a23e72454d
FEATURE: added the env variable DISABLE_DIRTY_CHECKS
2021-05-17 14:47:34 +02:00
_Bastler
aac5676765
hotfix
2021-05-17 12:50:15 +02:00
_Bastler
6ebec9ce68
add exitUrl script
2021-05-16 14:52:07 +02:00
_Bastler
c7623300f2
add input popup
2021-05-16 14:04:45 +02:00
_Bastler
9c392856eb
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2021-05-15 18:57:25 +02:00
_Bastler
d6e99d5f4d
fix overlay + typing focus
2021-05-14 11:59:38 +02:00
David Négrier
fe573893a1
Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues
...
Setting "importsNotUsedAsValues": "error"
2021-05-13 19:43:34 +02:00
_Bastler
1f5af5199d
animated tiles
2021-05-13 15:24:35 +02:00
_Bastler
6e9b2e8d31
merge develop, add animated tiles
2021-05-13 15:09:02 +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
David Négrier
8c1e01566a
Upgrading all dependencies in front
...
Upgrading to Webpack 5, Typescript 4, ...
2021-05-12 10:35:14 +02:00
David Négrier
4d4f845b9e
Setting "importsNotUsedAsValues": "error"
...
Turning the "importsNotUsedAsValues" TS config value to "error".
This will require us to use `import type` instead of `import` when we are importing a value that is only used as a type (and therefore that is dropped by the Typescript compiler).
Why this change?
This is a requirement to be able to use Svelte in the future. See https://github.com/sveltejs/svelte-preprocess/issues/206#issuecomment-663193798
2021-05-12 09:13:25 +02:00
_Bastler
e9baef5963
merge
2021-05-11 20:18:12 +02:00
David Négrier
d2b122efe5
Merge pull request #1035 from thecodingmachine/improveDirtyScene
...
FIX: trackDirtyAnims now listen to more generic events
2021-05-11 17:08:29 +02:00
kharhamel
4ec5ad9e33
FIX: trackDirtyAnims now listen to more generic events
2021-05-11 16:44:31 +02:00
David Négrier
0c279750be
Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-05-11 16:43:34 +02:00
_Bastler
8c3216dd3d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2021-05-11 14:53:24 +02:00
David Négrier
ad39b43df3
Closing game webcame in Jitsi
...
When stepping in Jitsi, the game webcam (from mediaManager) was not shut down.
And when enabling/disabling the webcam in Jitsi, the webcam in mediaManager was also
enabled/disabled. This PR fixes those issues.
It also fixes a race condition when closing a Jitsi where the mic/cam would be enabled at the same time.
2021-05-11 14:52:51 +02:00
kharhamel
f044b3d249
FIX: triggering a map transition now ignores other map transitions for 500ms
2021-05-11 11:05:05 +02:00
David Négrier
23bf78a026
Refactoring code to use the "visibilitychange" event
...
Using the "visiblitychange" event instead of relying on a "trick" related to RAF being disabled when a window is not open allows us to have cleaner code.
Bonus: the recursive call to "setTimeout" is gone, so the stacktrace growing indefinitely is gone too.
This should make the application a bit more stable.
2021-05-11 10:56:50 +02:00
jonny
8cef4f6e90
Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read
...
# Conflicts:
# front/src/Api/IframeListener.ts
2021-05-10 21:48:11 +02:00
jonny
8e136cebe8
added callback on playermove - gets quite delayed after walking for a few seconds
2021-05-10 21:27:17 +02:00
GRL
cd2d090a8b
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-05-10 11:46:16 +02:00
GRL
841bf29764
auto update show/hide layer
2021-05-10 11:20:07 +02:00
jonny
ce0c7ea3eb
Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read
2021-05-10 10:01:53 +02:00
jonny
a5260c0831
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
2021-05-10 09:58:59 +02:00
jonny
46996f7049
moved event trigger out of index array
2021-05-10 01:34:33 +02:00
jonny
8db72d2dfd
refactored to Array of tile
2021-05-10 01:34:32 +02:00
jonny
bed45a8310
cherry pick conflicts
2021-05-10 00:31:54 +02:00
jonny
ffe03d40f5
option to update tile
...
# Conflicts:
# front/src/Api/Events/ApiUpdateTileEvent.ts
# front/src/Api/IframeListener.ts
# front/src/Phaser/Game/GameScene.ts
2021-05-10 00:30:32 +02:00
_Bastler
deac58ebc7
merge into develop
2021-05-08 20:05:08 +02:00
jonnytest1
2922ae4603
Merge branch 'develop' into menu-command-api
2021-05-07 19:59:58 +02:00
DESKTOP-FMM8UI0\CLV
e655edd9bd
export class Popup and Soud of Iframe Api
...
let become const in SoundManager
2021-05-07 17:03:07 +02:00
David Négrier
6b4d064f19
Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
2021-05-06 16:25:13 +02:00
David Négrier
189dba2e21
Fixing memory leak when switching scenes
2021-05-06 15:38:24 +02:00
David Négrier
3b5f105daf
Setting the dirty state automatically when there is an animation frame
2021-05-06 15:38:22 +02:00
David Négrier
0c5e5ef578
Skip "render" if nothing changed on screen
...
For each requested animation frame (RAF) in Phaser, Phaser calls the "update" method, then the "render" method of each scenes.
The "render" method takes some time (and energy) to perform the rendering.
The fact is we probably don't need to call "render" if nothing changed on the screen (which happens most of the frames in a typical WorkAdventure game).
This commit is therefore overloading the "Game" class of Phaser to add a "dirty" flag.
Scenes can now add a "isDirty()" method. If all displayed scenes are pristine (not dirty), Phaser will skip rendering the frame altogether.
This saves "a lot" of energy, resulting in laptops that are not overheating when using WorkAdventure \o/
2021-05-06 15:36:45 +02:00
David Négrier
7ae66a63a4
Refactoring centering of DOM elements
2021-05-05 17:10:39 +02:00
David Négrier
cd2873e9d3
Fixing CI
2021-05-05 13:14:00 +02:00
David Négrier
bede7abdd8
Removing mousewheel to up down plugin
2021-05-05 12:15:13 +02:00
David Négrier
82073098e0
Merge branch 'develop' of github.com:thecodingmachine/workadventure into resolution
2021-05-05 11:01:11 +02:00
David Négrier
f66e69cb75
Improving pinch (virtual joystick stops when pinch begins)
2021-05-05 09:35:24 +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
Gregoire Parant
83159a121f
Revert logo loading and fix it
2021-05-04 15:47:45 +02:00
Gregoire Parant
c8692a08ce
Revert "Fix loader logo WA ( #991 )"
...
This reverts commit fa3ffe4d7a
.
2021-05-04 15:15:23 +02:00
grégoire parant
fa3ffe4d7a
Fix loader logo WA ( #991 )
2021-05-04 14:28:30 +02:00
David Négrier
04d3cf8593
Adding HdpiManager to start and scale from a default resolution that is correct by default for the game.
...
Fixing VirtualJoystick on resize.
2021-05-04 11:35:33 +02:00
jonnytest1
5069099000
fixed typing in chat still causes character to move ( #965 )
2021-05-03 20:26:42 +02:00
jonny
cd77af318d
added more properties
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-05-01 19:45:23 +02:00
_Bastler
b77ac7191a
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-04-30 08:33:23 +02:00
grégoire parant
925545d74f
Add error message ( #970 )
...
- Error link not found
- Error user was banned
- Error access dinied on the world
2021-04-29 23:47:30 +02:00
_Bastler
525441bc31
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-04-29 19:00:23 +02:00
jonny
8f1aea1c43
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
2021-04-29 10:49:14 +02:00
kharhamel
fe27169745
solved conflict with develop
2021-04-29 10:31:16 +02:00
_Bastler
92122a3272
nes.css style
2021-04-28 07:07:51 +02:00
jonny
6295c8275e
reset menu items on map change
2021-04-27 16:40:56 +02:00
jonny
79e530f0e6
launch jsons + type fixes
2021-04-27 00:04:08 +02:00
jonny
6e847b5f58
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop
2021-04-27 00:02:05 +02:00
_Bastler
daa7ff5c19
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-04-26 16:08:04 +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
Lurkars
66b90be0da
remove redundancy
2021-04-26 11:20:28 +02:00
Lurkars
93b7b7bc91
removed redundancy, fix for startLayer
2021-04-26 11:20:28 +02:00
Lurkars
9b6be3466b
support for group layer of Tiled (excludes 'start' layer)
2021-04-26 11:20:28 +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
f03f8076f3
Sound in Script Done
...
Fom script user can load, play and stop sound
2021-04-23 15:35:34 +02:00
David Négrier
4f4f499d47
Making alone mode more robust
...
This fixes a number of issues where the game was attempting to access a non existing connection (in alone mode)
2021-04-23 13:44:04 +02:00
kharhamel
6a2326c4b3
WIP: testing new resolution config
2021-04-21 18:04:00 +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
jonny
3836d5037c
game state can be read out by the client APIs
...
# Conflicts:
# front/src/Api/IframeListener.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/iframe_api.ts
2021-04-21 15:56:52 +02:00
jonny
006195e8cc
rewrote to run in event loop
2021-04-21 11:54:37 +02:00
jonny
6c6789411a
added loadPage Api call
2021-04-21 11:20:17 +02:00
David Négrier
84bd5eff50
Bump Phaser version
...
This reverts commit f2c3d6f158
.
Also, updates all dependencies to their latest allowed version.
# Conflicts:
# front/package.json
# front/yarn.lock
2021-04-21 10:35:38 +02:00
_Bastler
e03cf9dc26
trigger + audioplayer improvements
2021-04-21 07:44:12 +02:00
_Bastler
d55e6e9c84
Merge branch 'mobile_support' into partey
2021-04-20 21:50:05 +02:00
Kharhamel
5dc2f0ac47
Merge pull request #898 from thecodingmachine/touchZoom
...
FEATURE: add the ability to zoom in and out using touch screen
2021-04-20 14:51:08 +02:00
kharhamel
341b048d6c
improved the visuals of the joystick
2021-04-20 14:26:52 +02:00
_Bastler
6156f9e4d6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-04-20 11:12:05 +02:00
kharhamel
415d8f9466
the joystick is now visible only when pointer is down
2021-04-20 10:52:06 +02:00
kharhamel
56287a2958
put the virtual joystick into the userInputManager and restricted it to touchscreens
2021-04-19 18:10:33 +02:00
David Négrier
cb1dcb5786
Merge pull request #908 from ClementVieilly75/FTUEPopup
...
Unsubscribe to iframeEvents in CleanUpClosingScene
2021-04-19 11:24:43 +02:00
DESKTOP-FMM8UI0\CLV
5028a54422
Unsubscribe to iframeEvents in CleanUpClosingScene
2021-04-19 10:19:30 +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
Kharhamel
afd2ea2d03
Merge pull request #897 from thecodingmachine/maxPerGroup
...
FEATURE: added the env variable MAX_PER_GROUP
2021-04-16 17:19:01 +02:00
kharhamel
d7a74baa9d
FEATURE: add the ability to zoom in and out using touch screen
2021-04-15 16:37:58 +02:00
kharhamel
ce2c5e0cb5
FEATURE: added the env variable MAX_PER_GROUP
2021-04-15 15:50:51 +02:00
Gregoire Parant
a42e873f64
Merge branch 'master' into develop
2021-04-14 20:11:41 +02:00
_Bastler
64a3731bfb
merge dev, apply partey changes
2021-04-13 15:21:21 +02:00
Gregoire Parant
4119f69879
HotFix
...
- Key up m when user write message
- Size game share
2021-04-13 12:30:15 +02:00
PizZaKatZe
633bdfcaff
Always enable virtual joystick
...
Keeps 'toggle fullscreen' as a separate game setting.
2021-04-13 02:00:06 +02:00
PizZaKatZe
340caaff32
Make virtual joystick transparent
2021-04-13 02:00:05 +02:00
PizZaKatZe
e713120434
Reposition joystick (thx @TabascoEye)
2021-04-13 02:00:04 +02:00
PizZaKatZe
c3230bc2b3
Integrate virtual joystick
2021-04-13 02:00:03 +02:00
PizZaKatZe
edd4e9e95d
Add touch support for Jitsi and website triggers
2021-04-13 00:23:40 +02:00
Kharhamel
8cdf572685
Merge pull request #870 from joberthel/feature/player-companion
...
Added companion (pet) to player
2021-04-12 18:11:07 +02:00
Kharhamel
29d43d7776
Merge pull request #878 from thecodingmachine/localStorageGhost
...
FIX: improved the validation from localstorage for username and characterLayers
2021-04-12 14:56:51 +02:00
kharhamel
8e467f3e10
FIX: improved the validation from localstorage for username and characterLayers
2021-04-12 14:48:00 +02:00
David Négrier
3dd2a634a0
Allowing loading HTTP local resources from a HTTPS endpoint.
...
By default, maps are loaded in HTTPS if WorkAdventure is running in HTTPS, and in HTTP is WorkAdventure is running in HTTP.
Also, if WorkAdventure is running in HTTP and map loading fails, we try map loading in HTTPS (useful when we are working on WorkAdventure locally and want to load a map on a secure domain).
This commit adds the last combination: If WorkAdventure is running in HTTPS, and map loading fails in HTTPS **AND** if the map URL is targetting "localhost", "*.localhost" or "127.0.0.1", then we attempt to load the resource in HTTP.
Why?
"localhost" is considered secure context by modern browsers. So even if a page is loaded in HTTPS, it can load resources from any secure context (including localhost in HTTP).
This means that from "https://play.workadventu.re ", I can now test a map running locally on my machine (served by a classic webserver without any certificate).
This change should make map testing easier, since map developers will not have to install the whole WorkAdventure project to test their map locally.
2021-04-11 14:56:03 +02:00
Johannes Berthel
8d4e0c3e88
added companion compatibility with phaser 3.54.0
2021-04-09 18:30:30 +02:00
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup
2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
2c84d9a07d
position of popups changed
...
clear log in gameScene
2021-04-09 16:34:01 +02:00
DESKTOP-FMM8UI0\CLV
46cc7b3b3b
add pannels
2021-04-09 14:35:15 +02:00
Johannes Berthel
73e515c236
don't show companion scene after first refresh
2021-04-08 18:42:05 +02:00
Johannes Berthel
187e21eed9
load texture inside game scene instead inside of inside companion class
2021-04-06 19:10:18 +02:00
Johannes Berthel
52303c0bd6
added select companion scene
2021-04-02 23:00:51 +02:00
Johannes Berthel
c07079051a
transmit companion to remote players
2021-04-02 21:21:11 +02:00
David Négrier
dd0d1fa49f
Merge pull request #854 from thecodingmachine/loadhttpsmapsfromhttp
...
Allow loading https maps from http protocol
2021-03-30 17:57:38 +02:00
David Négrier
a68cf38cdc
Merge pull request #856 from thecodingmachine/alonemode
...
Adding an "alone" mode
2021-03-30 17:56:19 +02:00
David Négrier
02fb42b68a
Merge pull request #790 from thecodingmachine/iframe_api
...
Adding an API for inter-iframe communication
2021-03-30 16:31:30 +02:00
David Négrier
559e15ebb6
Adding an "alone" mode
...
In "alone" mode (or single-player mode), WorkAdventure does not connect to the server at all.
In order to enter the "alone" mode, you need to add "?alone=true" to the URL.
"alone" mode can be useful for tutorials (First Time User Experience) where you want to explain how WorkAdventure works without being disturbed by other users.
2021-03-30 16:08:49 +02:00
David Négrier
b6edefbe4e
Allow loading https maps from http protocol
...
In a development environment, we often run in HTTP.
The problem is that WorkAdventure will attempt to load maps using the HTTP protocol (even if the map is on a remote server that is available only in HTTPS).
This commit adds a "fallback". If we are in HTTP (so in a development environment) and if the map fails to load correctly, we will try again, but in HTTPS.
This allows development environment to load maps hosted on a HTTPS enabled server easily.
2021-03-28 18:35:01 +02:00
David Négrier
8b90a14c39
Fix import
2021-03-28 17:07:00 +02:00
David Négrier
aaaa192b71
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api
...
# Conflicts:
# front/dist/.gitignore
# front/dist/index.tmpl.html
# front/src/Phaser/Game/GameScene.ts
# front/src/WebRtc/CoWebsiteManager.ts
2021-03-28 16:53:15 +02:00
David Négrier
98aa94bb12
Minor changes
2021-03-28 16:36:02 +02:00
Johannes Berthel
5375528d7c
use map tilewidth instead of hardcoded values
2021-03-27 13:57:50 +01:00
kharhamel
886daebfea
improved the unloading process to not create a useless socket
2021-03-26 14:19:37 +01:00
kharhamel
0b352fc5dc
FIX: help camera settings popup now only show up once
2021-03-24 15:59:18 +01:00
Kharhamel
ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage
...
Warning message
2021-03-24 14:27:13 +01:00
kharhamel
8d6c1a50bf
FEATURE: warning message when world is near full capacity
2021-03-23 17:44:47 +01:00
DESKTOP-FMM8UI0\CLV
e05c25a857
replace let for const for variables non reassigned
2021-03-23 17:15:22 +01:00
Kharhamel
7765775df5
Merge pull request #825 from workadventure-xce/audio_player_improvements
...
Audio player improvements
2021-03-23 14:07:20 +01:00
PizZaKatZe
599fdd6ceb
Fix group icons and audio attenuation
2021-03-22 20:09:11 +01:00
PizZaKatZe
5bd6f49846
Fix (now legacy) 'playAudioLoop' property
2021-03-22 20:09:11 +01:00
PizZaKatZe
fdbcd98a9a
Implement audio volume and loop properties
2021-03-22 20:09:11 +01:00
David Négrier
f9a2097bc9
Merge pull request #828 from thecodingmachine/develop
...
Deploy 2021-03-22
2021-03-22 16:42:28 +01:00
DESKTOP-FMM8UI0\CLV
3ef3561b57
no message
2021-03-22 16:10:21 +01:00
GRL
e50c8bc354
Suppression of *{...} in every HTML files because the style.ccs file already declare it.
...
Suppression unused code
2021-03-19 16:21:35 +01:00
GRL
1cfb22f695
Creation of the HelpCameraSettingsScene
...
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
2021-03-19 15:40:07 +01:00
GRL
0b00055eda
Use includes instead of indexOf
2021-03-19 14:40:18 +01:00
GRL
c654f722e3
Add Firefox image
...
Check permissions in the game
Button Continue to continue without allowing camera and microphone
2021-03-19 12:04:37 +01:00
David Négrier
ffb5823b2a
Adding the ability to specify a custom Jitsi URL directly in the map
...
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)
The Jitsi external_api.js script is now lazily loaded.
2021-03-16 20:37:12 +01:00
DESKTOP-FMM8UI0\CLV
662134498c
Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-03-12 17:06:42 +01:00
David Négrier
086b88b09a
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api
2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV
c5c8770a60
Add First Version of Tuto
...
PopUp
Player Control disable
Fake bubble displayed
2021-03-12 16:39:29 +01:00
kharhamel
fe8c75610d
FIX: player anims correctly stop on the idle frame
2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV
fa4d917729
Resolve conflit with GameScene.ts
2021-03-11 16:03:39 +01:00
DESKTOP-FMM8UI0\CLV
f9f618094d
adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js
2021-03-10 17:22:39 +01:00
DESKTOP-FMM8UI0\CLV
8d0411e8a3
can manage position and width/height of a popUp using a square in Tiled
2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV
5e4940dba6
Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
...
* 'iframe_api' of https://github.com/thecodingmachine/workadventure :
Removing closeOnClick as it is not implemented
Adding a Popup object with a close() method on it.
2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV
f7f8be24bc
Set Position of the popUp with pos of an object in floorLayer object group
2021-03-10 08:57:49 +01:00
David Négrier
bb8b222c22
Adding a Popup object with a close() method on it.
2021-03-09 18:51:30 +01:00
David Négrier
18464e4942
Adding button clicked handling
2021-03-09 18:05:07 +01:00
Kharhamel
21cc842c33
Merge pull request #793 from thecodingmachine/adminWorldsLimit
...
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
2021-03-09 17:45:43 +01:00
DESKTOP-FMM8UI0\CLV
4545de8af1
Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
...
* 'iframe_api' of https://github.com/thecodingmachine/workadventure :
Adding button clicked handling
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-03-09 17:12:28 +01:00
DESKTOP-FMM8UI0\CLV
d29e0819f4
Get position of an object in Tile to set popUp Position
2021-03-09 17:07:14 +01:00
kharhamel
8abc34c631
FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call
2021-03-09 16:34:19 +01:00
David Négrier
1e002f93ed
Implementation of openPopup script method (WIP)
2021-03-09 16:21:14 +01:00
David Négrier
ed2ce68f37
Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api
...
# Conflicts:
# front/dist/.gitignore
# front/src/Phaser/Game/GameScene.ts
2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV
b175b7164d
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup
...
* 'develop' of https://github.com/thecodingmachine/workadventure :
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
Revert "Adding back admin in develop branch CI"
Adding back admin in develop branch CI
Fixing GA tag not included in play domain
FEATURE: better implementation of the admin global message
Fix ci
Update private access
Allow URLs relative to map base in iframe / openWebsite
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV
afac042706
supp debug log
2021-03-09 13:53:46 +01:00
David Négrier
2bef328d8a
Adding the abaility to track users entering/leaving a zone in the script language.
2021-03-08 18:58:38 +01:00
DESKTOP-FMM8UI0\CLV
858bf0b384
Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property
...
Adding map "Tuto2", the FTUE map
2021-03-08 09:28:15 +01:00
David Négrier
6fbf165c91
Adding the ability to register a single script using the "script" attribute at the map property level.
2021-03-07 21:02:38 +01:00
David Négrier
7d67f55012
Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages.
2021-03-06 16:00:07 +01:00
David Négrier
bf8e8bf777
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url
...
Allow URLs relative to map base in iframe / openWebsite
2021-03-04 18:21:48 +01:00
kharhamel
ad7e16c33b
FEATURE: better implementation of the admin global message
2021-03-04 16:18:06 +01:00
grégoire parant
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig
...
Fix last properties changed after trigger change position
2021-02-18 11:37:41 +01:00
Gregoire Parant
772c3174be
Fix last properties changed after trigger change position
2021-02-18 11:32:37 +01:00
Gregoire Parant
fff0cbc3f6
Revert message exit
2021-02-17 19:40:00 +01:00
Gregoire Parant
9b7b3eb140
Update feedback @tabascoeye
2021-02-17 19:31:05 +01:00
Gregoire Parant
ce423c9fec
Remove exit trigger action
2021-02-17 19:29:59 +01:00
Gregoire Parant
83fc7d0cc0
Merge branch 'develop' into exitTriggerAction
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
znerol
9670f92a08
Allow URLs relative to map base in iframe / openWebsite
2021-02-16 10:53:50 +01:00
MisterErwin
aff4c8d145
Do not change rooms if scene failed to load
...
Sometimes a following room fails to load (e.g., #582 ) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).
2021-02-13 14:15:09 +01:00
Gregoire Parant
b92b7304b0
Fix to use clear All Keys
2021-02-11 21:48:24 +01:00
David Négrier
91fddd6893
Slugifies the Jitsi room name
...
This will avoid Jitsi breaking on unexpected characters and displaying a HTTP 404 error.
2021-02-10 13:51:17 +01:00
David Négrier
f6e93da48a
Fixing loading logo being displayed when nothing was loaded
2021-02-10 12:08:16 +01:00
David Négrier
a5bdf68246
Moving property reading inside startJitsi (startJitsi is called at 2 different places)
2021-02-10 11:08:57 +01:00
Mickael Chimansky
5cb9624b0b
fixup! Jitsi config properties
2021-02-09 20:31:49 +01:00
Mickael Chimansky
9c4d0aa32f
Jitsi config properties
2021-02-09 16:05:21 +01:00
Gregoire Parant
4de9b8ba40
Fix icon discussion
...
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
2021-02-03 23:11:33 +01:00
grégoire parant
c41c058fb0
Merge pull request #527 from oliverlorenz/feature/iframe-feature-policy
...
feat: adds property openWebsitePolicy property to set "allow" property in iframe
2021-02-03 17:38:35 +01:00
grégoire parant
f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser
...
Permit puiblic report
2021-02-02 18:09:25 +01:00
Gregoire Parant
7eb38fae83
Permit puiblic report
...
- Create report html
- Add report flag
2021-01-29 21:09:10 +01:00
kharhamel
f2c3d6f158
downgraded phaser version to 3.24.1
2021-01-28 23:03:06 +01:00
grégoire parant
86f1099247
Merge pull request #648 from thecodingmachine/customCharacterLadyLoading
...
Fix custom character lazy loading
2021-01-26 15:27:46 +01:00
Gregoire Parant
45b355f780
Refactor lazy loading
2021-01-26 15:21:23 +01:00
Gregoire Parant
1dd2858424
Fix feadback @Kharhamel
2021-01-26 14:04:42 +01:00
Gregoire Parant
803be36def
Merge branch 'develop' into customCharacterLadyLoading
2021-01-26 09:02:17 +01:00
Gregoire Parant
c6903cc4c5
Use Error scene and add banned message
2021-01-26 08:57:10 +01:00
Gregoire Parant
8de05c39c1
Lock user when he was banned
2021-01-25 14:10:16 +01:00
Gregoire Parant
beb53df364
Error problem open new map
2021-01-25 13:18:57 +01:00
Gregoire Parant
5f88a1a0b9
Exit trigger action
...
- [x] Add trigger message custom
- [x] Add trigger for exit map
- [x] Update documentation
2021-01-25 12:21:40 +01:00
Kharhamel
39194b5531
Merge pull request #642 from tabascoeye/patch-1
...
cleanup when closing the scene
2021-01-25 10:35:01 +01:00
Kharhamel
d32fca9777
Merge pull request #597 from psy/feature_streams
...
add remote files and streams to playAudio
2021-01-25 10:33:43 +01:00
Gregoire Parant
75d8d46c62
clean
2021-01-24 16:02:10 +01:00
Gregoire Parant
d93a8da828
Fix custom character lazy loading
2021-01-24 15:57:47 +01:00
TabascoEye
39b433eef5
Update GameScene.ts
...
stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene
Fixes #633
2021-01-23 01:16:13 +01:00
David Négrier
adca51f6de
Replacing FourOFourScene with more generic ErrorScene
2021-01-17 20:42:45 +01:00
psy
8d67947bc1
move map url to else case
2021-01-14 11:48:06 +01:00
psy
f431e769cc
add remote files and streams to playAudio
2021-01-14 11:45:14 +01:00
kharhamel
472fbb1de0
All player textures are now lazy-loaded
2021-01-08 11:44:41 +01:00
Piotr Dobrowolski
af260ad229
front: add AnimatedTiles plugin
2021-01-07 18:37:57 +01:00
kharhamel
3ce8427378
fixed a game crashed because of lack of animations and improved the character class
2021-01-07 12:46:13 +01:00
kharhamel
fbb44af369
added a basic loader
2021-01-06 17:08:48 +01:00
kharhamel
1359fbe977
updated phaser to version 3.51 and fixed the BC
2021-01-06 15:00:54 +01:00
Piotr Dobrowolski
28d687e338
front: implement map sounds
2021-01-04 16:57:31 +01:00
Oliver Lorenz
7c89cf0e47
feat: adds property openWebsitePolicy to set allow property in iframe
2020-12-29 23:17:16 +01:00
David Négrier
e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage
...
Manage Local Storage customers player error
2020-12-18 16:33:36 +01:00
Gregoire Parant
a1fd209578
Fix catch error
2020-12-18 16:30:22 +01:00
David Négrier
36f886aed6
Fixing cat running too fast on reconnect scene because animations were duplicated
2020-12-18 16:08:04 +01:00
David Négrier
df114bc1ce
Fixing broken reconnection
2020-12-18 15:59:07 +01:00
Gregoire Parant
323fa6abba
Create exception error
2020-12-18 14:30:46 +01:00
Gregoire Parant
f5dd5efc0e
Manage Local Storage customers player error
2020-12-18 13:56:25 +01:00