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

3132 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Négrier abe76fa325
Merge pull request #1638 from thecodingmachine/fix_map_caching 
Fixing map caching
 2021-12-08 14:30:04 +01:00
David Négrier 7a6e250a58 Fixing map caching 
Maps in the GameScene can be modified by the scripting API.
If so, previously, the changes to the maps were persisted in the ITiledMap object in the GameScene because this was cached by the Phaser loader,
causing a series of problems, the most noticeable being that templating in the scripting API stopped working on a second visit of a page.

We are now deep-copying the map on load to avoid these nasty effects.

Closes https://github.com/workadventure/scripting-api-extra/issues/77
 2021-12-08 14:23:00 +01:00
David Négrier 307bf29f47
Merge pull request #1634 from thecodingmachine/fix_existSceneUrl_undefined_master 
exitSceneUrl property redirects to a URL with "undefined" as the second URL part (2)
 2021-12-07 16:13:32 +01:00
David Négrier 1d2d60a67a Fixing issue with "instance" part of the URL lost in exitSceneUrl URLs. 2021-12-07 15:55:36 +01:00
David Négrier 0d5c318040 Adding a test case to test exitSceneUrl property 
this test case reproduces error #1631
 2021-12-07 15:55:26 +01:00
David Négrier 7b94f8b8ca
Merge pull request #1612 from thecodingmachine/fix-admin-sockets 
Creating only one WS connection to pusher from admin
 2021-12-07 14:56:13 +01:00
David Négrier 4cff230256 Creating only one WS connection to pusher from admin 
Also: migration to Typescript 4.5 and µWebsockets 1.20.4
 2021-12-01 20:14:53 +01:00
grégoire parant 4875a8fed9
Merge pull request #1610 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 7b52c13fae
Merge pull request #1609 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 #1608 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 #1607 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 21e400a4a1
Merge pull request #1604 from thecodingmachine/develop 
Deploy 2021-11-29
 2021-11-29 18:43:57 +01:00
David Négrier 591467f1e3
Merge pull request #1603 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 #1598 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 #1593 from thecodingmachine/develop 
Next release 1.5.7
 2021-11-25 11:44:36 +01:00
grégoire parant 923a134270
Merge pull request #1592 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 #1591 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 #1589 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 #1590 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 #1588 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
David Négrier e8a78a0646
Merge pull request #1585 from thecodingmachine/HotFixCleanTokenParamUrl 
Clean token auth of url params
 2021-11-24 17:10:22 +01:00
David Négrier 94959e2e91 Merge branch 'develop' of github.com:thecodingmachine/workadventure into HotFixCleanTokenParamUrl 
# Conflicts:
#	back/src/Services/Logger.ts
 2021-11-24 17:03:29 +01:00
David Négrier 257162c451 Fixing prettier 2021-11-24 17:02:11 +01:00
David Négrier cf6d461247
Merge pull request #1586 from thecodingmachine/revert-1552-improve_logging 
Revert "Improving log messages"
 2021-11-24 17:00:37 +01:00
David Négrier d1122d75ec Fixing CI 2021-11-24 16:59:22 +01:00
David Négrier d8c10ce10a CI fix 2021-11-24 16:32:37 +01:00
David Négrier 065404758b Making sure pusher and admin are started in CI 2021-11-24 16:22:26 +01:00
David Négrier 6e6cdc7bde
Revert "Improving log messages" 2021-11-24 16:20:07 +01:00
David Négrier 6c5f330b71
Merge pull request #1584 from thecodingmachine/fixes 
Fixes
 2021-11-24 15:55:33 +01:00
Gregoire Parant b02c09fc7b Clean token auth of url params 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-24 15:49:45 +01:00
David Négrier be3c1eea6f
Merge pull request #1583 from thecodingmachine/pretty_ci_front_fix 
Fixing running of prettier check on the front
 2021-11-24 15:46:18 +01:00
David Négrier 0fe2de090e
Merge pull request #1552 from thecodingmachine/improve_logging 
Improving log messages
 2021-11-24 15:43:24 +01:00
Alexis Faizeau 5c3036e18b Display a default skin on remote player entity 2021-11-24 15:43:01 +01:00
David Négrier a1107bd20e Merge branch 'develop' of github.com:thecodingmachine/workadventure into improve_logging 2021-11-24 15:36:35 +01:00
David Négrier 07ba532c5e Prettier fixes on front 2021-11-24 15:31:17 +01:00
David Négrier 9b29fde1b3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into pretty_ci_front_fix 2021-11-24 15:30:29 +01:00
David Négrier dc58f16418
Merge pull request #1582 from thecodingmachine/end-to-end-tests 
Making the loader resizable
 2021-11-24 15:30:15 +01:00
David Négrier 2cbf5b56af Fixing linting 2021-11-24 15:29:12 +01:00
David Négrier d3bd99b5ee Fixing running of prettier check on the front 2021-11-24 15:24:24 +01:00