Commit graph

3453 commits

Author SHA1 Message Date
TabascoEye
0cb17c7fd1
adding map properties to documentation
* screenshot of the result of the map properties
* first try at documenting map properties
2021-12-08 16:41:22 +01:00
David Négrier
15bdb0eb56
Merge pull request #1636 from thecodingmachine/no_retry_on_token_decrypted_error
Don't retry Axios if a token decryption failed
2021-12-08 15:32:43 +01:00
David Négrier
598c7412a2 When sending an invalid token, the HTTP API from the Pusher now returns a 401 instead of an HTTP 500. 2021-12-08 14:46:23 +01:00
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
Hanusiak Piotr
b12fb228af fixed typos 2021-12-08 13:25:54 +01:00
Hanusiak Piotr
4d473480cf enter and leave zone events 2021-12-08 13:18:06 +01:00
Hanusiak Piotr
03cf5c05ff added zoom_margin optional property for zone definition 2021-12-08 13:03:25 +01:00
Hanusiak Piotr
082b33cf02 more subtle zone leaving camera work 2021-12-08 11:31:49 +01:00
David Négrier
ff77a18262 Don't retry Axios if a token decryption failed
If a token decryption failed, it will emit a HTTP 500.

We should not retry Axios in this case but rather fail.

Note: a token decryption failed should not throw a HTTP 500 but another error code (HTTP 401?)
So maybe this fix is plainly wrong.
2021-12-08 11:16:39 +01:00
Hanusiak Piotr
957ba8f8c7 more subtle start follow player by camera. wip 2021-12-07 17:03:51 +01:00
Hanusiak Piotr
8eaacdf2e5 companion pictures store 2021-12-07 16:37:24 +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
Hanusiak Piotr
5efa17651c show woka-icon with camera on 2021-12-07 16:07:58 +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
Hanusiak Piotr
cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
David Négrier
1e6ce4dec8 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-07 14:59:17 +01:00
Hanusiak Piotr
731f616cce woka icon inside menu 2021-12-07 14:56:42 +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
Hanusiak Piotr
b36f39d3d9 revert menu icon to its original view 2021-12-07 14:01:30 +01:00
Hanusiak Piotr
e62ad6b9c9 merged develop 2021-12-07 13:56:28 +01:00
Hanusiak Piotr
e97fd1d38c Merge branch 'develop' into feature-camera-zone-focus 2021-12-07 13:20:15 +01:00
Hanusiak Piotr
29ccb52c93 cleanup 2021-12-07 13:18:36 +01:00
Hanusiak Piotr
b00d24dbf7 refocusing on target (if any) in case of an external resize 2021-12-07 12:48:08 +01:00
David Négrier
2f8bd52dba
Merge pull request #1628 from workadventure-xce/feat/force-cowebsite-triggers
New setting: Always ask before opening cowebsites / Jitsi meetings
2021-12-07 10:42:33 +01:00
David Négrier
d68da0754e
Merge pull request #1472 from thecodingmachine/type_module
Switching API to use type="module" scripts
2021-12-07 09:23:58 +01:00
David Négrier
df700a8740
Merge pull request #1494 from workadventure-xce/fix/volumeSliderUI
Fix volume slider UI updates
2021-12-07 09:20:55 +01:00
David Négrier
2495aa1faf
Merge pull request #1615 from thecodingmachine/dependabot/npm_and_yarn/front/joeattardi/emoji-button-4.6.2
Bump @joeattardi/emoji-button from 4.6.0 to 4.6.2 in /front
2021-12-07 09:14:10 +01:00
PizZaKatZe
d49d44d7ea New setting: Always ask before opening cowebsites / Jitsi meetings 2021-12-06 23:25:25 +01:00
PizZaKatZe
a71fc40b5d Fix volume slider UI updates 2021-12-06 21:54:33 +01:00
David Négrier
6a8717c22f
Merge pull request #1602 from thecodingmachine/e2e_reconnect_tests
Adding a reconnect feature in case first Pusher request fails
2021-12-06 18:44:18 +01:00
Alexis Faizeau
a6a3a76491
Merge pull request #1625 from thecodingmachine/linting
Fix Svelte linting
2021-12-06 18:35:16 +01:00
David Négrier
b9840cfa3d Fix CI 2021-12-06 18:34:09 +01:00
David Négrier
84f7a8c383 Pretty fix 2021-12-06 18:20:06 +01:00
Alexis Faizeau
3bb86dfea8 Fix Svelte linting 2021-12-06 18:16:24 +01:00
David Négrier
c27662c315 Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests 2021-12-06 18:07:47 +01:00
David Négrier
d7875c2c68 Adding missing handler for error message in front + removing 2 useless classes in ServerToClientMessage 2021-12-06 18:00:17 +01:00
Alexis Faizeau
2859093648
Merge pull request #1624 from thecodingmachine/linting
Add lint on Svelte files
2021-12-06 16:47:26 +01:00
David Négrier
331daca854 Fixing admin token for requests 2021-12-06 16:37:27 +01:00
Alexis Faizeau
c95e20c677 Lint & Prettier fixes on Svelte files 2021-12-06 16:36:05 +01:00
Alexis Faizeau
6cd76b9c1b Add Eslint check & Prettier on Svelte files 2021-12-06 16:10:35 +01:00
David Négrier
f6803b6d5d Fixing pusher and back url 2021-12-06 15:38:30 +01:00
David Négrier
15565c9a29 Changing pusher / back URL depending on environment 2021-12-06 15:29:24 +01:00
David Négrier
44c4b4fc34 Fixing error handling of fonts when there is no connection to front 2021-12-06 15:14:38 +01:00
David Négrier
a991f0eec9 increase timeouts (who knows....) 2021-12-06 12:04:04 +01:00
Hanusiak Piotr
3d3ca45921 ran prettier for back 2021-12-06 11:37:55 +01:00
David Négrier
f5f69e7143 Fixing missing await 2021-12-06 11:35:37 +01:00
David Négrier
94762c86c5 Refactoring tests 2021-12-06 11:21:18 +01:00
David Négrier
05f805445a Adding a delay.... who knows! 2021-12-05 21:33:40 +01:00