52fe79df47
FEATURE: improved the mediaStore code to disable tracks instead of deleting them
2021-09-01 17:14:05 +02:00
29b790ec32
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-01 14:58:52 +02:00
0272e4f691
merged in develop again
2021-09-01 14:55:29 +02:00
7971daa27f
openTabPropertyKey (create new props in own file)
2021-09-01 14:50:48 +02:00
ad60993b9a
Merge pull request #1398 from tabascoeye/develop
...
add possibility to set size of coWebsite and Jitsis via map property
2021-09-01 14:42:41 +02:00
9e459748bf
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-01 12:05:30 +02:00
19baf7f582
fix ReportMenu ( #1397 )
2021-09-01 10:11:12 +02:00
da03e60de4
Update GameScene.ts
...
typo fixed
2021-08-30 19:42:18 +02:00
ae3e2a09d9
add possibility to set size of coWebsite and Jitsis via map property
2021-08-30 19:32:02 +02:00
a633f79dd7
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-27 20:19:30 +02:00
d2816220eb
Merge pull request #1395 from thecodingmachine/triggerOnSetLayer
...
Properties changed via the Iframe API now trigger changes directly
2021-08-27 17:41:58 +02:00
4536a63e69
Properties changed via the Iframe API now trigger changes directly
...
Changes performed in WA.room.setPropertyLayer now have a real-time impact.
If the property is changed on a layer the current player is on, the changes will be triggered.
2021-08-27 15:05:14 +02:00
e806325da9
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-27 10:40:30 +02:00
7c956d1481
REVIEW : Migration Menu and Report Menu in Svelte ( #1363 )
...
* WIP: svelte menu
* temp
* temp
* New menu svelte
* Migration of report menu in svelte
* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu
* Suppression of HTML files that aren't use anymore
* fix deeployer
* First pass on css
* First pass on css
* Second pass on css and reportMenu
* Second pass on css and reportMenu
* Second pass on css and reportMenu
* Third pass on css and reportMenu
* Correction following test
* Contact page only if environment variable exist
* Update service worker
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com >
* Change requested
* Change requested
Co-authored-by: kharhamel <oognic@gmail.com >
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com >
2021-08-26 12:01:07 +02:00
2ce9451f2f
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-23 19:31:49 +02:00
8c43c2e6e8
Rollback on createPromise switched to public
2021-08-23 18:54:00 +02:00
ad95fa5e11
Execute scripts of the map after creating gameScene
2021-08-23 18:53:59 +02:00
c2b3d23ec0
Player return a the same position when after editing his profile (same as reconnection)
2021-08-20 09:49:37 +02:00
0c796dff90
Player return a the same position when after editing his profile
2021-08-19 17:22:16 +02:00
6ff4f4f52e
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-19 10:36:23 +02:00
8a64491952
Improving popup
...
If a popup message is empty, only the buttons will be displayed (not the container)
Unrelated: the Sound.play method in the API now accepts 0 arguments.
2021-08-18 11:53:41 +02:00
123d6fd535
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-17 11:40:32 +02:00
06be65c12f
Merge pull request #1368 from thecodingmachine/fix_zone_enter_exit
...
Fixing enter/leave event not properly sent on adjacent zones
2021-08-17 10:08:51 +02:00
1d45bab46d
Fixing enter/leave event not properly sent on adjacent zones
...
On adjacent zones, the zone leave event was not properly triggered when leaving a zone for the zone next to it.
Closes #1366
2021-08-17 10:04:11 +02:00
1958449178
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-16 19:21:09 +02:00
d2413896c7
GameManager has an attribute scenePlugin
2021-08-16 11:50:09 +02:00
1fd5c146e0
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-15 17:46:54 +02:00
02a21209ec
Exit scene acess denied detected ( #1369 )
...
* Add auth token user to get right in admin and check if user have right
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com >
* Update error show
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com >
2021-08-15 08:51:35 +02:00
27d331ea37
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-08-10 10:25:24 +02:00
73a2cec4df
merge
2021-08-08 15:47:53 +02:00
af613f5b5b
Merge branch 'master' into develop
2021-08-06 15:53:33 +02:00
e0fb31fc58
WIP: Migrate AudioManager in Svelte ( #1325 )
...
* Migrate AudioManager in Svelte
* use import type when needed
2021-08-06 09:11:17 +02:00
e9e96c9e30
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-08-05 20:46:42 +02:00
ac282db1ac
Removing pointless console.log
2021-08-05 17:21:55 +02:00
6b9b999996
Making embedded iframes scriptable using the WA.room.website namespace.
2021-08-05 12:37:05 +02:00
5bb29e99ba
Adding a "allowApi" property to authorize the API in a website.
2021-08-05 12:30:07 +02:00
ce3c53ae3f
Adding the ability to inject websites directly inside maps
...
This PR adds the ability to inject a website INSIDE a map (as an iframe inside a Phaser HTML object)
The iFrame will be rendered transparently, unless you set a background-color on the body, which opens a number of cool possibilities.
Needs to be done: allowing the iframe API in those iframes.
2021-08-05 12:30:05 +02:00
570110f831
Fixing openWebsiteTriggerMessage not hidden when moving out of zone.
2021-08-05 12:07:12 +02:00
bc1c6a4986
Refactoring displayActionMessage signature. Now accepting an options object. This should allow for more options in the future.
2021-08-05 12:02:00 +02:00
87e4367455
Refactoring layoutManagerActionStore. It now supports an uuid field.
...
layoutManagerVisibilityStore is now a derived field from layoutManagerActionStore.
2021-08-05 11:19:28 +02:00
92fee33b64
Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3
2021-08-05 09:24:05 +02:00
d1e5d57459
Changing the method name from "triggerMessage" to "displayActionMessage".
...
Generally speaking, I like to call the message at the bottom an "action message".
And things can "trigger" it, but in the case of a method that actually proactively displays the message, I find "displayActionMessage" to be a better name.
Also, removing package-lock files and improving code style
2021-08-05 09:17:33 +02:00
190007a21f
Fix joystick postion
...
- Aply new size after open and close iframe and permit to keep the good position of the joystick on the WorkAdventure screen
2021-08-04 18:07:04 +02:00
d046460d76
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-08-04 18:02:49 +02:00
4713010929
Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3
2021-08-03 19:01:16 +02:00
2d8098b06d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into layoutManagerSvelte
2021-08-03 11:40:51 +02:00
1436b15328
Migrate layoutManager in Svelte
2021-08-03 11:13:08 +02:00
14b4229019
Merge branch 'develop' into GlobalMessageToWorld
...
# Conflicts:
# CHANGELOG.md
# front/src/Api/Events/IframeEvent.ts
# front/src/Components/App.svelte
# pusher/src/Services/SocketManager.ts
2021-08-02 23:07:39 +02:00
2480d13f58
Merge branch 'master' into develop
2021-08-02 22:26:34 +02:00
f2d382681b
Merge branch 'develop' into loadTileset
...
# Conflicts:
# CHANGELOG.md
# front/src/Phaser/Game/GameScene.ts
2021-08-02 22:16:05 +02:00
kharhamel