Commit Graph

3540 Commits

Author SHA1 Message Date
Hanusiak Piotr
0f1378c069 PR fixes 2021-12-14 10:28:41 +01:00
David Négrier
8a96ff8ee4
Merge pull request #1614 from ValdoTR/user-room-token
Added the user-room token created from admin when we access a room
2021-12-13 17:50:49 +01:00
Valdo Romao
d523eee5bd Fixed pusher lint error 2021-12-13 16:22:59 +00:00
Valdo Romao
592e07bc4f Fixed linter errors 2021-12-13 16:19:47 +00:00
Valdo Romao
dbbfdfb66b Updated API doc 2021-12-13 16:08:44 +00:00
David Négrier
bbef3b3eaf Upgrade Typescript to 4.5
This commit contains the new Typescript version but NOT the fixes needed to have the project compiling.
2021-12-13 16:45:16 +01:00
PizZaKatZe
80794975aa Add new layer property audioCopyright 2021-12-11 22:24:28 +01:00
PizZaKatZe
aad582df70 Display map link in map credits if provided 2021-12-11 22:23:54 +01:00
Hanusiak Piotr
bbe539b785 moved gettingSnapshot logic into TexturesHelper 2021-12-10 12:02:14 +01:00
Gregoire Parant
9357afd13f Update warning container
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-10 01:54:48 +01:00
Gregoire Parant
a5d4d163e1 Add test mode
`*` char permit to defined test mode with warning message

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-12-10 01:51:40 +01:00
David Négrier
27aa3c51d3
Merge pull request #1642 from thecodingmachine/add_link_awesome
Adding links to awesome-workadventure
2021-12-09 18:11:29 +01:00
David Négrier
ac2a7e3672 Adding a reference to awesome-workadventure in README 2021-12-09 18:10:30 +01:00
David Négrier
525ca16968 Adding a reference to awesome-workadventure in CONTRIBUTING 2021-12-09 18:08:04 +01:00
David Négrier
1b982588e4
Merge pull request #1641 from thecodingmachine/doc_contrib_scripting
Developer documentation regarding scripting API
2021-12-09 12:17:18 +01:00
David Négrier
bef81edb84
Merge pull request #1639 from tabascoeye/develop
adding map properties to documentation
2021-12-09 12:17:02 +01:00
David Négrier
d7d77dd7d6 Developer documentation regarding scripting API
This PR adds a first developer documentation regarding how to extend the scripting API.
2021-12-09 12:13:16 +01:00
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
Benedicte Quimbert
a38fbf1cfc Merge branch 'player-local-storage' of github.com:thecodingmachine/workadventure into player-local-storage 2021-12-08 11:49:49 +01:00
Benedicte Quimbert
6871335e9b Documentation on type Position 2021-12-08 11:48:16 +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
Bénédicte Q
e60ed68cd0
Update front/src/Api/Events/IframeEvent.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-12-08 10:14:31 +01:00
Bénédicte Q
8a6ad40d6b
Update front/src/Api/Events/IframeEvent.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-12-08 10:06:34 +01:00
Bénédicte Q
66da11f854
Update docs/maps/api-camera.md
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-12-08 10:06:07 +01:00
Bénédicte Q
2708384354
Update docs/maps/api-camera.md
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-12-08 10:05:46 +01:00
Benedicte Quimbert
08824b70aa Documentation 2021-12-07 18:47:40 +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