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

2028 commits

Author SHA1 Message Date
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 1ed10b0cdd Adding Prettier in messages 2021-12-16 16:40:50 +01:00
David Négrier 88a6e80a8f Adding JsonMessages to Docker image 2021-12-16 16:09:59 +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
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 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