Commit Graph

2609 Commits

Author SHA1 Message Date
David Négrier
d8327d1b72
Apply suggestions from code review
Fixing missing return attribute in doc
2022-01-22 22:20:41 +01:00
dependabot[bot]
151cdd353a
Bump nanoid from 3.1.23 to 3.2.0 in /front
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-22 03:06:53 +00:00
Lukas Hass
5dabd0b2f8
Pre-compile frontend and add environment config script 2022-01-21 21:01:34 +01:00
David Négrier
0be77164ec Translating retry connection error message and fixing E2E tests 2022-01-21 17:09:29 +01:00
David Négrier
51c3f1d972 Refactoring translator to use "_" instead of "translator._".
This is shorter and pollutes less the code.
2022-01-21 17:09:29 +01:00
Alexis Faizeau
1789f36a63 Implement zod checking on translator compiler 2022-01-21 17:09:29 +01:00
Alexis Faizeau
68dc7c2555 Fix languageFound type error on build 2022-01-21 17:09:29 +01:00
Nolway
54ae3bf215 Add language switcher on settings 2022-01-21 17:09:29 +01:00
Nolway
6ff4d6d634 Add fr-FR translations 2022-01-21 17:09:29 +01:00
Nolway
bd01a35cc6 Add en-US translations 2022-01-21 17:09:29 +01:00
Nolway
31b92da6ce Move translate documentation 2022-01-21 17:09:29 +01:00
Nolway
41ef9fd49f Replace cookie by local storage to store language 2022-01-21 17:09:29 +01:00
Nolway
8286cdd41d Add WA.player.language in the API 2022-01-21 17:09:29 +01:00
Nolway
77f8426788 Add translator documentation 2022-01-21 17:09:29 +01:00
Nolway
8a2767ef40 Implement Translator: i18n system 2022-01-21 17:09:29 +01:00
Hanusiak Piotr
cebb803b2b added test for moveTo command 2022-01-20 15:47:49 +01:00
Hanusiak Piotr
e87c0a07a4 moveTo parameter working if layer is found 2022-01-20 15:10:54 +01:00
Hanusiak Piotr
cb0c5beecf get additional hash parameters from url 2022-01-20 14:14:24 +01:00
Hanusiak Piotr
dd03a2d1ff Merge branch 'develop' into feature-move-character-api 2022-01-20 13:00:31 +01:00
Hanusiak Piotr
b088e63290 little fixes for moveTo example and with event return data 2022-01-20 10:04:19 +01:00
Hanusiak Piotr
bf6b9a7c83 do not call joystick logic if not on mobile 2022-01-20 09:39:41 +01:00
_Bastler
3b3807d474 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-20 08:16:40 +01:00
David Négrier
6a9bd08893 Updating Node builder version 2022-01-19 21:09:57 +01:00
Hanusiak Piotr
62b00f852d throw an exception if no path found when using player.moveTo command. Cancelling path following no longer rejects the promise 2022-01-19 17:22:28 +01:00
David Négrier
0409422a44
Merge pull request #1732 from thecodingmachine/remove-last-message
Remove the last message before adding a new chat peer
2022-01-19 15:51:05 +01:00
David Négrier
fd88399938
Simplifying if condition 2022-01-19 15:45:16 +01:00
Alexis Faizeau
30811e7702 Remove the last message before add a new chat peer 2022-01-19 15:44:12 +01:00
Hanusiak Piotr
8f40e7a33c reject path following path promise if interrupted 2022-01-19 14:16:05 +01:00
Hanusiak Piotr
c023c4f8fd optional following path movement speed 2022-01-19 13:53:06 +01:00
Hanusiak Piotr
9b94705177 manually resolve promise on certain events for player path following 2022-01-19 13:09:17 +01:00
Hanusiak Piotr
f78392ceab Pathfinding manager will now return path steps in pixel units by default 2022-01-19 12:30:08 +01:00
_Bastler
1d6c36d877 fix front 2022-01-19 11:41:05 +01:00
Hanusiak Piotr
f96eac4737 Merge branch 'walking-shortest-path' into feature-move-character-api 2022-01-19 10:54:19 +01:00
Hanusiak Piotr
9e5d8f5d9c cr fixes 2022-01-19 10:37:56 +01:00
Hanusiak Piotr
29e44d3023 Player move API wip 2022-01-19 09:34:06 +01:00
Hanusiak Piotr
1c4e803dd7 move to the nearest tile if possible 2022-01-18 12:33:46 +01:00
Hanusiak Piotr
67cd0dfb29 disable context menu. Move player only on left-click 2022-01-18 11:18:52 +01:00
Hanusiak Piotr
391fe7eed3 for pathfinding we are now taking into consideration all tiles, looking for 'collides' property 2022-01-18 10:26:40 +01:00
Hanusiak Piotr
7576cea7e0 removed obsolete comments. Pass path as reference 2022-01-17 16:11:08 +01:00
Hanusiak Piotr
3e81278e72 proper player movement on click 2022-01-17 16:04:59 +01:00
Hanusiak Piotr
e557e8ea72 player following the path wip 2022-01-17 14:36:00 +01:00
Hanusiak Piotr
77ee39110f handle pointerup event 2022-01-17 11:52:02 +01:00
Hanusiak Piotr
28543be121 Player class is no longer dependent on UserInputManager 2022-01-17 11:37:28 +01:00
Hanusiak Piotr
173d10738d created interface to implement for UserInputManager 2022-01-17 11:16:42 +01:00
_Bastler
24aaa4582f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-17 08:21:06 +01:00
Hanusiak Piotr
000b2cfe73 created PathfindingManager. WIP 2022-01-14 12:49:18 +01:00
David Négrier
82c2d21423
Merge pull request #1654 from thecodingmachine/feature-camera-management
Feature camera management
2022-01-14 11:57:05 +01:00
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
_Bastler
15db3e3704 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:36:39 +01:00
dependabot[bot]
8c11db1f62
Bump follow-redirects from 1.14.4 to 1.14.7 in /front
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 07:50:10 +00:00
Hanusiak Piotr
c2b2385e96 Camera now centers on focusable zone properly 2022-01-13 18:54:38 +01:00
_Bastler
2f16ec51e4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 16:56:39 +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
_Bastler
22bfe8bc71 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 13:30:09 +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
_Bastler
04a334c8e7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-12 10:56:50 +01:00
_Bastler
f9f2370afb fix firefox private 2022-01-12 10:56:47 +01:00
Alexis Faizeau
3f3f488924
Merge pull request #1718 from thecodingmachine/master
Hot fixes
2022-01-12 10:47:27 +01:00
Gregoire Parant
2f4e518f17 HotFix Htaccess to accespt "*"
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-12 08:20:54 +01:00
_Bastler
fa4cd34c49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-11 08:42:54 +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
_Bastler
5cc573ac49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-07 09:59:00 +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
6766ee86da Merge branch '2daysLimit' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 14:32:17 +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
Gregoire Parant
08847e1a64 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2022-01-05 12:08:27 +01:00
Gregoire Parant
ae122261d4 Fix prettier update
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-05 11:49:01 +01:00
Gregoire Parant
8b758a0053 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-05 11:47:31 +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
_Bastler
899621dd03 fix actions 2022-01-04 14:38:10 +01:00
_Bastler
b5b2eb487c latest dev 2022-01-04 13:59:09 +01:00
_Bastler
a9277fd977 latest dev 2022-01-04 13:55:34 +01:00
_Bastler
b2ec610027 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-04 13:31:14 +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
_Bastler
9b62e5f4ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-03 19:10:22 +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
_Bastler
4d520a5994 bring back emojis! 2022-01-03 13:42:13 +01:00
_Bastler
be6d7c7151 remove emoji cdn 2022-01-03 13:10:15 +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
_Bastler
abf6d94082 fix audio 2021-12-30 16:56:26 +01:00
Lurkars
e7022e96d7 fix audio player src 2021-12-30 16:48:02 +01:00
_Bastler
fafa069dac new companions 2021-12-30 16:01:24 +01:00
_Bastler
4ec2ba559a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-30 16:01:08 +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
_Bastler
146129b829 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-24 22:05:46 +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
_Bastler
579d6991bd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-23 21:45:55 +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
_Bastler
ea49dafea4 Fix invalid maps 2021-12-16 19:26:28 +01:00
_Bastler
2132fc0323 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-16 18:41:44 +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
_Bastler
dd77d86f06 latest dev 2021-12-16 09:26:05 +01:00
_Bastler
bb9db762d2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-16 08:29:43 +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
_Bastler
97e64b2296 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-15 13:23:01 +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
_Bastler
301d756a3d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-13 19:10:50 +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
_Bastler
4695098632 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-09 08:14:10 +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
_Bastler
3e1fefef1e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 10:48:24 +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
_Bastler
576f027f9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 09:25:12 +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
_Bastler
517a78b686 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 09:15:47 +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
_Bastler
ccbddf1d74 latest dev 2021-12-07 08:38:35 +01:00
_Bastler
13e854c4c4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 08:38:21 +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
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
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
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
44c4b4fc34 Fixing error handling of fonts when there is no connection to front 2021-12-06 15:14:38 +01:00
David Négrier
492fd2ed4e Adding retried URL in retry error logs 2021-12-04 18:30:12 +01:00
David Négrier
2cfc504e9a Adding a retry on /anonymLogin 2021-12-04 18:18:43 +01:00
Hanusiak Piotr
4bc21a95c5 ran prettier 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
a1a83775d6 issues with zone triggering fixed 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
37949eda53 working with zoom modifier calculating per zone 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ddaa81a7ac some more tweaks with smooth zooming control 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
092daa245f locking zooming via player input 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
ef3a7513e2 camera zoom using scaleManager zooming. WIP 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
Hanusiak Piotr
8016cf3c1a fallback in case of CanvasRenderer 2021-12-04 16:29:28 +01:00
Hanusiak Piotr
c33e78d1ee ran prettier 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
a62cfe1cd8 fallback if avatar could not be loaded 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ed8d6855b1 fixed bug with woka picture snapshot taking current frame and not front 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
ecb334cbd2 fixed Woka picture positioning 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
642d3bb301 Changed the way WOKA's are stored 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
2ea54fd243 use Prettier to fix style issues 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
913a07350d little cleanup, added reject for Character snapshot 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
dcd8e57853 images are blurred no more 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
7b94ac644d working woka picture if no camera view is provided 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
f4ce82481e avatar as a menu button 2021-12-04 15:36:11 +01:00
Hanusiak Piotr
b8eeb3c8ab saving players avatar textures to the texturesManager 2021-12-04 15:36:11 +01:00
David Négrier
411ee251ff Improving URL displaying of failed Axios request 2021-12-03 22:02:19 +01:00
David Négrier
487b8317e7 Adding stacktrace to error message in console 2021-12-03 21:58:08 +01:00
David Négrier
ebcfc069bc More details in the error 2021-12-03 21:45:25 +01:00
David Négrier
8b21ba5383 Improving Axios error logging 2021-12-03 20:55:46 +01:00
David Négrier
f90bd85ded Improving error reporting and adding Video reports 2021-12-03 19:54:34 +01:00
David Négrier
c89afba6cd Working on more tests 2021-12-03 15:21:31 +01:00
David Négrier
78ee4009c8 Improving tests, WIP 2021-12-03 09:28:30 +01:00
David Négrier
9bba6069b4 Making LIVE_RELOAD configurable 2021-12-03 09:23:52 +01:00
dependabot[bot]
6be57a2b3c
Bump @joeattardi/emoji-button from 4.6.0 to 4.6.2 in /front
Bumps [@joeattardi/emoji-button](https://github.com/joeattardi/emoji-button) from 4.6.0 to 4.6.2.
- [Release notes](https://github.com/joeattardi/emoji-button/releases)
- [Commits](https://github.com/joeattardi/emoji-button/compare/v4.6.0...v4.6.2)

---
updated-dependencies:
- dependency-name: "@joeattardi/emoji-button"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 18:29:39 +00:00
Valdo Romao
dd79f7d0f4 Added the user-room token created from admin when we access a room 2021-12-01 15:50:14 +00:00
David Négrier
fcf0888864 Adding a reconnect feature in case first Pusher request fails
Now, if the first pusher request fails, a waiting message will be displayed and the application will reconnect when the pusher comes back alive or the network connection is established again.
2021-12-01 14:14:02 +01:00
_Bastler
0f501881d2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-01 09:04:20 +01:00
_Bastler
2366011238 latest dev 2021-11-30 17:43:22 +01:00
_Bastler
ee6443670a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-30 17:31:08 +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
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
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
Alexis Faizeau
812485f863 Cannot rezise main cowebsite when fullscreen is enable 2021-11-29 18:35:32 +01:00
Benedicte Quimbert
7eda8a45a7 Reverts adding scale to the camera updated event and uses it directly from the website manager 2021-11-26 14:46:02 +01:00
_Bastler
c43348f9f0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-25 11:45:23 +01:00
Benedicte Quimbert
f761858328 Refactoring and documentation update 2021-11-25 10:56:43 +01:00
Benedicte Quimbert
5b6a8ca4d7 Adds the camera to available APIs with retrieving of the worldView 2021-11-25 10:56:42 +01:00
Benedicte Quimbert
99dfd77600 WIP API updates for tutorial and more 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
353577b1d7 Fixes deleting SharedVariablesManager's close() function 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
926fcf9d63 Cleans forgotten useless commentaries 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
a22c2a09b8 Uses the current player position rather than the starting one to position iframe 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
bf69b55e99 Creates player state and uses it to get and set values from local storage 2021-11-25 10:55:54 +01:00
Benedicte Quimbert
89cd292527 Allows to read and write "Player properties" from LocalStorage 2021-11-25 10:55:54 +01:00
Alexis Faizeau
a775a01d2a Resize cowebsites when main slot is loaded 2021-11-25 10:48:14 +01:00
_Bastler
3c1c82fbd9 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-25 07:37:55 +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
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
_Bastler
96e9540e97 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 17:10:50 +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
_Bastler
e796503810 latest dev 2021-11-24 16:29:14 +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
_Bastler
a99be4fbf5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 15:44:37 +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
_Bastler
04a7d20d54 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 15:32:05 +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
7c6105d93a Making the loader resizable
This way, if the window is resized while loading, the loading bar will stay in the middle
2021-11-24 15:21:07 +01:00
Alexis Faizeau
24640d13bb Fix removing of co-website action trigger 2021-11-24 14:50:19 +01:00
_Bastler
16a73d4de6 getMapProperty 2021-11-24 14:32:45 +01:00
_Bastler
bc7d9a96fe fix keepCircle Property 2021-11-24 13:06:43 +01:00
_Bastler
3b98888c3a merge latest dev 2021-11-24 13:00:27 +01:00
David Négrier
2f632ae472
Merge pull request #1580 from thecodingmachine/fix-tab
Fix tab index on embedded iframes
2021-11-24 12:17:25 +01:00
Alexis Faizeau
6a7385947d Fix authentication mandatory 2021-11-24 11:55:28 +01:00
_Bastler
1873ac1836 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 11:18:29 +01:00
Alexis Faizeau
4ca763c028 Fix tab index on embbed iframes 2021-11-24 11:05:18 +01:00
David Négrier
550ffaf8a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into end-to-end-tests
# Conflicts:
#	front/src/Administration/AnalyticsClient.ts
2021-11-24 11:01:50 +01:00
David Négrier
806b97afab Refactoring Analytics to remove errors 2021-11-24 10:21:19 +01:00
David Négrier
a82f4e1813 Adding end-to-end tests
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
2021-11-23 15:43:34 +01:00
Gregoire Parant
ecc6321e17 Add new action post hog
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-18 11:39:56 +01:00
_Bastler
347156a3ea Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-17 19:34:31 +01:00
Alexis Faizeau
44c99fb0ef Fix zoom from cowebsite changes 2021-11-17 15:26:58 +01:00
_Bastler
a6891b704c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-17 09:28:11 +01:00
Gregoire Parant
e5979998c5 Update design of credit page
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:28:54 +01:00
Gregoire Parant
0614fa7b47 HotFix copy link to share it
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:03:54 +01:00
Gregoire Parant
e54732be1b HotFix authentication manager to get data from back
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 14:46:32 +01:00
Gregoire Parant
ba89d9b122 HotFix DISABLED_ROOM for env variable
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 13:18:40 +01:00
Gregoire Parant
8768374460 HotFix connexion manager
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 13:14:40 +01:00
Gregoire Parant
ec1cc92c8b replace console log by error
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 11:23:18 +01:00
Gregoire Parant
c1dc438138 HotFix encrypted and decrypted error
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 11:14:27 +01:00
_Bastler
13dafdf14b update Dockerfile 2021-11-16 11:06:20 +01:00
_Bastler
e43e1d8463 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-16 10:56:33 +01:00
Gregoire Parant
d3964ae25b HotFix conflict merging 2021-11-15 16:36:10 +01:00
David Négrier
4e042389c5 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	pusher/src/Controller/AuthenticateController.ts
#	pusher/src/Controller/IoSocketController.ts
#	pusher/src/Services/JWTTokenManager.ts
2021-11-15 16:30:45 +01:00
Gregoire Parant
210a789aa4 Fix feedback @moufmouf 2021-11-15 15:58:08 +01:00
Gregoire Parant
bbc2ac2550 Update Connection manager to clean url history of navigator 2021-11-15 15:25:49 +01:00
Gregoire Parant
15cdc54ec3 Add evnvironment Enum for OPID_LOGIN_SCREEN_PROVIDER variable 2021-11-12 19:36:37 +01:00
Gregoire Parant
f905426ebd Add new variable login provider to connect user 2021-11-12 19:36:13 +01:00
Gregoire Parant
24a1f324c7 Add OpenId login url and provider to login user 2021-11-12 19:35:34 +01:00
Gregoire Parant
ca74f92051 Pull open id admin from @GRP 2021-11-12 16:59:34 +01:00
Gregoire Parant
fa233e13c6 Changes ANONYMOUS variable
This variable will be use to mandatory login user in self hosted
2021-11-12 16:43:37 +01:00