_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,701 Commits 2 Branches 0 Tags 47 MiB
f2af7c6e95
Commit Graph

1891 Commits

Author SHA1 Message Date
Hanusiak Piotr
7ee41bad30 change setViewport action to set for CameraAPI 2022-01-14 11:41:37 +01:00
Hanusiak Piotr
17e9c3c586 handle instant camera view change 2022-01-14 11:31:49 +01:00
Hanusiak Piotr
c2b2385e96 Camera now centers on focusable zone properly 2022-01-13 18:54:38 +01:00
Hanusiak Piotr
a164cedf3f Camera FocusTarget width and height are now optional 2022-01-13 16:43:58 +01:00
Hanusiak Piotr
d99930a67e save last zoom value if setting the camera viewport without locking it 2022-01-13 16:17:49 +01:00
Hanusiak Piotr
d62b116e5d merge setPosition and focusOn into setViewport 2022-01-13 16:08:16 +01:00
David Négrier
57d2dec756
Merge pull request #1724 from thecodingmachine/master 
Backport fix 2022-01-13
 2022-01-13 15:59:54 +01:00
Hanusiak Piotr
a1c96b0524 merged develop 2022-01-13 10:44:06 +01:00
David Négrier
9425fd70c0 Adding a new property to prevent script from being loaded in "modules" mode 
Scripts in module mode need to be abide by the Same Origin Policy (CORS headers are used to load them)
This can cause issues on some setups.

This commit adds a new "scriptDisableModuleSupport" that can be used to disable the "modules" mode.

Closes #1721
 2022-01-12 17:36:31 +01:00
Hanusiak Piotr
905bd079ec camera is now properly focusing on target when zooming, if any 2022-01-12 12:58:27 +01:00
Hanusiak Piotr
58af1f05f7 unlocking zooming with a delay when entering / leaving focusable zone 2022-01-12 12:08:11 +01:00
Alexis Faizeau
3f3f488924
Merge pull request #1718 from thecodingmachine/master 
Hot fixes
 2022-01-12 10:47:27 +01:00
jonny
786448a2b2 prettier fix 2022-01-09 23:21:07 +01:00
jonny
73ab4f3a26 prettier fix 2022-01-09 23:18:38 +01:00
jonny
e5afac1df5 prettier fix 2022-01-09 23:17:17 +01:00
jonny
954d39bb0c always set hash 2022-01-09 13:51:44 +01:00
David Négrier
0fb09cc431 Fixing closing of all websites. 2022-01-06 12:27:00 +01:00
David Négrier
787cc508b8
Merge pull request #1708 from thecodingmachine/fix_firefox_private_browsing 
Fixing WA crashing in Firefox private mode
 2022-01-06 11:57:12 +01:00
David Négrier
d713c82568 Fixing WA crashing in Firefox private mode 
Due to the way we now handle the browser cache, previously ignored errors in the Cache API were now explicitly thrown, preventing the loading of Firefox in private mode.
This commit fixes the issue and improves the stacktrace display of errors at the same time.
 2022-01-06 11:55:43 +01:00
David Négrier
ab0f5e9837 Stopping sending literal errors 
Errors now must be of "Error" type.
Rule added in eslint.
 2022-01-06 10:52:06 +01:00
David Négrier
f82012d315 Flagging Room.isPublic property as deprecated 2022-01-05 16:30:41 +01:00
David Négrier
968e71cbca Removing completely any analysis of the URL from the front. 
Instead, data related to room is sent from the admin, via the pusher.
 2022-01-05 14:32:02 +01:00
David Négrier
c85679b42c Merge branch 'develop' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 10:19:23 +01:00
David Négrier
24baf5664c All promises are now handled 2022-01-04 17:06:29 +01:00
David Négrier
6e27ffb2d5 Starting fixing unhandled promises 2022-01-04 16:50:43 +01:00
David Négrier
bade2b41b6
Merge pull request #1693 from jonnytest1/patch-2 
added columns type definition
 2022-01-04 08:57:46 +01:00
David Négrier
b5778c386f
Merge pull request #1692 from workadventure-xce/fix/user-select 
Disable user selection of UI elements
 2022-01-04 08:55:21 +01:00
David Négrier
5234cbe3f3
Merge pull request #1689 from Lurkars/fixAudioPlayerSrc 
fix audio player src
 2022-01-03 18:25:38 +01:00
David Négrier
4eb2ebd034
Merge pull request #1680 from workadventure-xce/fix/follow-via-keyboard 
Fix follow requests via keyboard
 2022-01-03 18:24:03 +01:00
David Négrier
fb69476b97
Merge pull request #1698 from thecodingmachine/ts-proto 
Migrating front protobuf encode/decode to ts-proto lib
 2022-01-03 18:07:19 +01:00
David Négrier
6bd9a998f9 Removing unused messages 2022-01-03 16:26:52 +01:00
David Négrier
b0ee4fc633
Merge pull request #1696 from ngc4622/iframe-division-by-zero 
ScaleManager: do not apply new size if width is zero
 2022-01-03 16:01:01 +01:00
David Négrier
bf070c33b5 Migrating front protobuf encode/decode to ts-proto lib 
The ts-proto lib has the huge advantage of producing code the "Typescript" way and not the "Java" way.
In particular, for "oneof" types in protobuf, it is generating "ADT" that can be used to check if we forgot or not to deal with a type.
 2022-01-03 15:52:46 +01:00
Benedicte Quimbert
ac27ab7e3e Revert "WIP enable/disable tutorial according to the map 'tutorial' property" 
This reverts commit 47a6710b60e3856bf57c0700fe33bec95c6fc6dd.
 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
85d45071fa Makes onCameraUpdate subscribe-able 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
d9482d484b WIP enable/disable tutorial according to the map 'tutorial' property 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
99f9d56c5c Updates room documentation for embeddedWebsite properties 2022-01-03 11:45:47 +01:00
Bénédicte Q
a69f232a06 Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-01-03 11:45:47 +01:00
Bénédicte Q
adc71b5695 Update front/src/Api/Events/IframeEvent.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
3abc571e79 Corrects scale managing and camera event listening 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
2a7c8f3786 Reverts adding scale to the camera updated event and uses it directly from the website manager 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
1e073d8a0e Refactoring and documentation update 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
4356767739 Adds the camera to available APIs with retrieving of the worldView 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
d672a2dead WIP API updates for tutorial and more 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
c53f0c6c8c Fixes deleting SharedVariablesManager's close() function 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
cbf7cdfe29 Cleans forgotten useless commentaries 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
516d756db1 Uses the current player position rather than the starting one to position iframe 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
3490daed6b Creates player state and uses it to get and set values from local storage 2022-01-03 11:45:47 +01:00
Benedicte Quimbert
e025c1dc8e Allows to read and write "Player properties" from LocalStorage 2022-01-03 11:45:47 +01:00
Tobias Tefke
0603d08572 ScaleManager: do not apply new size if width is zero 
If the game width reaches zero (e.g by resizing a cowebsite manually),
a division by zero happens when calculating the new zoom.
This results in NaN, which causes phaser to reach an invalid state when rezooming.
 2022-01-03 09:09:21 +01:00
jonnytest1
8cdbf382ad
added columns type definition 2021-12-31 15:55:17 +01:00
PizZaKatZe
bda46be466 Remove left-over debug message 2021-12-31 15:35:21 +01:00
PizZaKatZe
5460bd49be Fix follow requests via keyboard 2021-12-31 15:35:21 +01:00
PizZaKatZe
c55cad6227 Disable user selection of UI elements 2021-12-31 15:27:08 +01:00
Lurkars
e7022e96d7 fix audio player src 2021-12-30 16:48:02 +01:00
Alexis Faizeau
68431c5242
Merge branch 'develop' into master 2021-12-30 13:18:13 +01:00
Alexis Faizeau
b148a46e3c Remove unused policy type from ApiData typeguard 2021-12-30 12:51:52 +01:00
David Négrier
36ce4f8f29
Merge pull request #1664 from Chasethechicken/layers 
Add missing layer properties
 2021-12-24 16:10:15 +01:00
David Négrier
d37165219c Migrating followStates and followRoles from a const object to a type restricted to only the string values allowed. 
This allows for more secure code (compilation checks) and simpler code too (we can pass strings instead of const values)
 2021-12-24 15:49:25 +01:00
David Négrier
840f8626ad Refactoring code to use Svelte native "$" store unpacking. 2021-12-24 15:39:28 +01:00
David Négrier
a1cfaa0225 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-24 15:06:15 +01:00
David Négrier
87bc7f8099 Slightly improving follow request popup design 2021-12-24 14:36:38 +01:00
David Négrier
fefe7c8aa5 Removing the "Ask others to follow you?" popup 
No need to ask twice, the user just pressed the "follow" button.
 2021-12-24 13:48:35 +01:00
Alban Bruder
380328079b
Merge branch 'develop' into feature-admin-message-queue 2021-12-24 12:49:08 +01:00
Alban Bruder
00e0a14a37 Display multiple admin messages 2021-12-24 12:15:54 +01:00
Gregoire Parant
5d729d0560 Fix message Warning Container 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-24 12:02:47 +01:00
David Négrier
4a7be94b92 Fixing bug in redirect handling of rooms 2021-12-23 21:36:13 +01:00
David Négrier
524339a3a0 Adding hightlight to player names when they follow each others 2021-12-23 18:07:51 +01:00
David Négrier
368a115b4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-23 16:04:59 +01:00
Gregoire Parant
efa57d2754 Fix pretier 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 15:06:32 +01:00
David Négrier
d54e129fbe Fixing bug in redirect handling of rooms 2021-12-23 14:53:03 +01:00
Gregoire Parant
96d46e96c2 Fix svelte error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 14:52:42 +01:00
Gregoire Parant
df3c618ffa Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
 2021-12-23 14:23:08 +01:00
Gregoire Parant
fd64fc43a4 Finish 2 days room limit 
- Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 13:09:28 +01:00
David Négrier
9efa115982 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-23 11:04:20 +01:00
David Négrier
35463930a0 Sending color outline on connect 2021-12-23 10:22:19 +01:00
Gregoire Parant
60f4cf75c3 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 10:02:46 +01:00
David Négrier
482ba9690a Sharing outline color changes in real time 2021-12-22 18:34:36 +01:00
Chasethechicken
6cae134c8f Fix indentation 
To make prettier happy
 2021-12-22 10:13:26 +01:00
Chasethechicken
1ea7b45c7e Fix misplaced semicolon 2021-12-21 23:26:15 +01:00
David Négrier
90f7287860 Adding the ability to set the player's color outline via the scripting API 
(currently not shared with the other players yet)
 2021-12-21 17:02:53 +01:00
Alban Bruder
85c07e3723 Fix admin message update in frontend 2021-12-21 13:03:24 +01:00
Chasethechicken
6f4fe47808 Add missing layer properties 
Enables map makers to set the alpha, visibility, origin and size of layers.

Co-authored-by: jonny <ga86lad@mytum.de>
 2021-12-21 11:31:14 +01:00
PizZaKatZe
50147db895 Block running in follow mode 2021-12-20 13:36:29 +01:00
PizZaKatZe
21b1313a18 Get rid of buggy open state 2021-12-20 12:50:43 +01:00
Lurkars
3916d9c58e Add follow button to ui, improved flow 2021-12-20 11:35:06 +01:00
Lurkars
2cd088c049 Change follow request to "F" button, use nes-css buttons 2021-12-18 11:58:30 +01:00
Hanusiak Piotr
f8353bd7b5 send camera update event from CameraManager 2021-12-17 11:05:11 +01:00
David Négrier
b2bcfde5b1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into upgrade_typescript_4.5 2021-12-16 16:07:17 +01:00
David Négrier
0c281db411 More eslint fixes (+ ignoring no-unsafe-argument rule for now) 2021-12-16 15:57:37 +01:00
Hanusiak Piotr
4ebc55a429 subtle changes in CameraManager in order to distinguish between setPosition and focusOn 2021-12-16 14:31:26 +01:00
Hanusiak Piotr
5f26a39a5d added basic WA.camera commands 2021-12-16 13:41:28 +01:00
David Négrier
98d3a58861 Improving typings of VirtualJoystick 2021-12-16 10:04:55 +01:00
David Négrier
fa2e583d48 Reimporting correctly types moved to /messages 2021-12-16 10:04:41 +01:00
PizZaKatZe
a481376633 Clean up remaining debug log messages 2021-12-15 20:11:47 +01:00
PizZaKatZe
d3297a448e Add setting that ignores follow invites 2021-12-15 19:47:14 +01:00
PizZaKatZe
e3e7fba539 Rename InteractMenu/-Store => FollowMenu/-Store 2021-12-15 18:50:59 +01:00
PizZaKatZe
2bd71790b5 Use user IDs instead of names 2021-12-15 18:42:24 +01:00
PizZaKatZe
1ab8165951 Process input events in follow mode as well 2021-12-15 18:42:24 +01:00
PizZaKatZe
290e5131e9 Clean up follow implementation; stop following when leader leaves the scene 2021-12-15 18:42:24 +01:00
PizZaKatZe
7bff782f7f Improve follow abort message; avoid having to change it in backend 2021-12-15 18:42:24 +01:00
PizZaKatZe
0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
PizZaKatZe
1fca99c0d1 Send follow me request to all players 2021-12-15 18:41:36 +01:00
PizZaKatZe
e7f1395809 Stop before running into followed Avatar; stop sprite animation 2021-12-15 18:36:12 +01:00
danb
372dda792f Fix issue of interrupted conversation in follow-mode 2021-12-15 18:36:12 +01:00
danb
7c7144527c Add minimum distance to enable following 2021-12-15 18:36:12 +01:00
danb
f340e8114d Implement automatic following of other players. 
* initiate following by reacting to the interact event
* subscribe to remote player and update positions in relation to them
  instead of reacting to user input
* cancel following if the user moves actively again
 2021-12-15 18:36:12 +01:00
PizZaKatZe
f65491e709 Remove unused import 2021-12-15 18:36:11 +01:00
David Négrier
e2afb6ec02
Merge pull request #1626 from workadventure-xce/fix/mapProperties 
Display link to map in map credits if provided in map properties
 2021-12-15 17:12:34 +01:00
Hanusiak Piotr
99ffb7b450 merged develop 2021-12-15 15:23:21 +01:00
David Négrier
2fff6ae41e Improving code security by adding stricter typings 2021-12-14 18:55:58 +01:00
David Négrier
7ec8cd2a5b Fixing CI 2021-12-14 16:16:42 +01:00
David Négrier
ea7fc62c00 Merge branch 'feature-picture-of-user' into feature-picture-of-user-merge 2021-12-14 16:06:35 +01:00
David Négrier
8efeab97c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-picture-of-user-merge 2021-12-14 15:50:24 +01:00
David Négrier
0a705eadf9
Merge pull request #1616 from Waclaw-I/feature-camera-zone-focus 
Focusable zones
 2021-12-14 15:43:45 +01:00
David Négrier
0e68490e75 Refactoring with a MapStore 
A great deal of the complexity of the current code is that we must chain
2 reactive values (one in the map "GameScene.MapPlayersByKey" and one in
the snapshot store).

The new generic MapStore class can be used to listen to stores inside a map.
When the store inside the map, or the map itself is modified, the
resulting store is updated.
 2021-12-14 14:47:25 +01:00
Hanusiak Piotr
960c247b20 added documentation for Focusable Zones 2021-12-14 12:03:05 +01:00
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
592e07bc4f Fixed linter errors 2021-12-13 16:19:47 +00: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
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
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
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
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
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
Hanusiak Piotr
cbe595e7b6 simples woka icon styling 2021-12-07 15:21:54 +01:00
Hanusiak Piotr
731f616cce woka icon inside menu 2021-12-07 14:56:42 +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
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
Benedicte Quimbert
4b4f5520db Corrects scale managing and camera event listening 2021-12-06 18:44:37 +01:00