Commit Graph

3151 Commits

Author SHA1 Message Date
Hanusiak Piotr
3d3ca45921 ran prettier for back 2021-12-06 11:37:55 +01:00
Hanusiak Piotr
d6be8bc71b revert changes made to the starter/map.json 2021-12-04 17:26:23 +01:00
Hanusiak Piotr
9a81aa83f1 added test map for focusable zones feature 2021-12-04 17:24:39 +01:00
Hanusiak Piotr
a2627eb577 Merge branch 'feature-camera-zone-focus' of github.com:Waclaw-I/workadventure into feature-camera-zone-focus 2021-12-04 17:11:56 +01:00
Hanusiak Piotr
4bc21a95c5 ran prettier 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
a1a83775d6 issues with zone triggering fixed 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
37949eda53 working with zoom modifier calculating per zone 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ddaa81a7ac some more tweaks with smooth zooming control 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
092daa245f locking zooming via player input 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ef3a7513e2 camera zoom using scaleManager zooming. WIP 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
David Négrier
936a6bfeec
Merge pull request from thecodingmachine/fix_empty_submessage
Fix sending empty variable message for users that have no right to re…
2021-12-03 17:23:04 +01:00
David Négrier
d23a64d074 Fix sending empty variable message for users that have no right to read variable
When a user had no right to read a variable and the variable changed, the user was notified nonetheless with an empty SubMessage, causing an error message in the front:

> Uncaught Error: Unexpected batch message type onmessage RoomConnection.ts:181 RoomConnection.ts:181:30 onmessage RoomConnection.ts:181

This fix closes 
2021-12-03 16:07:42 +01:00
Hanusiak Piotr
831d238be7 ran prettier 2021-12-03 10:11:16 +01:00
Hanusiak Piotr
e792b75ad3 issues with zone triggering fixed 2021-12-02 18:11:22 +01:00
Hanusiak Piotr
3e3a04d50e working with zoom modifier calculating per zone 2021-12-02 17:46:09 +01:00
Hanusiak Piotr
c09609f70c some more tweaks with smooth zooming control 2021-12-02 14:44:13 +01:00
Hanusiak Piotr
d0cd7b0806 locking zooming via player input 2021-12-02 13:41:52 +01:00
Hanusiak Piotr
85bf2fe70d camera zoom using scaleManager zooming. WIP 2021-12-02 13:20:40 +01:00
Hanusiak Piotr
eecf831ca5 detecting zoe enter and leave events 2021-12-01 14:48:14 +01:00
grégoire parant
9eb4206fe0
Merge pull request from thecodingmachine/master
Master
2021-11-30 18:10:36 +01:00
grégoire parant
4875a8fed9
Merge pull request from thecodingmachine/fixingQueryParamsRegisterUrl
Fixing "Query string parameters prevent WA from loading"
2021-11-30 17:45:07 +01:00
Gregoire Parant
b098b5f37d Fixing "Query string parameters prevent WA from loading"
Due to a regression, query string parameters added to the URL (like:

http://play.workadventure.localhost/_/global/maps.workadventure.localhost/starter/map.json?utm_source=sendinblue&utm_campaign=WA+-+2021+Christmap+map+launch&utm_medium=email#foo

) were causing a crash in WA.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-30 17:29:53 +01:00
David Négrier
5e7e43732a Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-11-30 15:13:36 +01:00
David Négrier
7b52c13fae
Merge pull request from thecodingmachine/fix_prod_docker_compose
Adding missing environment variable in docker-compose.prod.yml
2021-11-30 15:09:52 +01:00
David Négrier
0a6d9e88bc
Merge pull request from thecodingmachine/admin_url_not_compulsory
Making the ADMIN_URL parameter optionnal in front
2021-11-30 15:06:47 +01:00
David Négrier
8205775dc9 Adding missing environment variable in docker-compose.prod.yml
In the new version, a new FRONT_URL environment variable is now compulsory in the Pusher.
This is done to setup CORS security in the pusher.

This commit adds this environment variable in the sample docker-compose.prod.yml file.
2021-11-30 15:02:52 +01:00
David Négrier
d81ecb3199 Making the ADMIN_URL parameter optionnal in front
This parameter is only used in the SAAS version (and ideally, should disappear completely).
The warning message that uses the ADMIN_URL should originate from the admin itself.
2021-11-30 14:58:37 +01:00
David Négrier
986f826830
Merge pull request from thecodingmachine/fix_query_string
Fixing "Query string parameters prevent WA from loading"
2021-11-30 14:48:15 +01:00
David Négrier
06483fd586 Fixing "Query string parameters prevent WA from loading"
Due to a regression, query string parameters added to the URL (like:

http://play.workadventure.localhost/_/global/maps.workadventure.localhost/starter/map.json?utm_source=sendinblue&utm_campaign=WA+-+2021+Christmap+map+launch&utm_medium=email#foo

) were causing a crash in WA.

This commit fixes the issue (and adds a E2E test)
2021-11-30 14:34:43 +01:00
David Négrier
12a8aa2585
Merge pull request from thecodingmachine/fix_injection
Fixed potential injection by switching map container to PHP
2021-11-30 12:01:22 +01:00
David Négrier
f40dda69f4 Fixing missing header extension in new maps image 2021-11-30 11:50:15 +01:00
David Négrier
60475111cc Fixing maps image 2021-11-30 09:15:42 +01:00
David Négrier
41fd848fa0 Fixed potential injection by switching map container to PHP
Some HTML files were importing iframe_api.js automatically by detecting the referrer document.

While this was done in a safe way (the map container does not use cookies), it is not
a best practice to load a script originating from document.referrer.

This PR solves the issue by using PHP to inject the correct domain name in the HTML files.
2021-11-29 19:05:13 +01:00
David Négrier
21e400a4a1
Merge pull request from thecodingmachine/develop
Deploy 2021-11-29
2021-11-29 18:43:57 +01:00
David Négrier
591467f1e3
Merge pull request from thecodingmachine/fix-black-screen
Cannot rezise main cowebsite when fullscreen is enable
2021-11-29 18:37:36 +01:00
Alexis Faizeau
812485f863 Cannot rezise main cowebsite when fullscreen is enable 2021-11-29 18:35:32 +01:00
David Négrier
233c3d1abe
Merge pull request from thecodingmachine/refactor_testcafe_tests
Refactoring test cafe tests
2021-11-28 16:52:24 +01:00
David Négrier
eac4bb2875 Refactoring test cafe tests
- Using "Roles" to log users
- Adding seemingly useless import statement but important for code completion
2021-11-28 16:43:12 +01:00
grégoire parant
5e11cccdf9
Merge pull request from thecodingmachine/develop
Next release 1.5.7
2021-11-25 11:44:36 +01:00
grégoire parant
923a134270
Merge pull request from thecodingmachine/fix-blank-cowebsite-bar
Resize cowebsites when main slot is loaded
2021-11-25 11:36:48 +01:00
Alexis Faizeau
a775a01d2a Resize cowebsites when main slot is loaded 2021-11-25 10:48:14 +01:00
David Négrier
3d29fcad7e
Merge pull request from thecodingmachine/develop
Next release 1.5.7
2021-11-24 22:57:20 +01:00
David Négrier
ecb72d0fd1 Adding FRONT_URL in pusher 2021-11-24 22:47:46 +01:00
grégoire parant
5bdb5d98a9
Merge pull request from thecodingmachine/fix-grab-cowebsite
Handle touch & mouse events on same time for cowebsite holder
2021-11-24 19:44:07 +01:00
grégoire parant
a59c07d8a3
Merge pull request from thecodingmachine/FixHashLocalStorage
Fix htag last map URL visited in localstorage
2021-11-24 19:43:48 +01:00
Gregoire Parant
060c844468 Fix htag in localstorage
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-24 19:24:43 +01:00
Alexis Faizeau
07c01d81bf Handle touch & mouse events on same time for cowebsite holder 2021-11-24 18:38:39 +01:00
David Négrier
69a26a0e55
Merge pull request from thecodingmachine/develop
Deploy 2021-11-24 2
2021-11-24 17:44:48 +01:00
David Négrier
445599416c Commenting waiting as this does not work for some reason 2021-11-24 17:24:11 +01:00