_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,776 Commits 2 Branches 0 Tags 47 MiB
d30e7b1393
Commit Graph

2920 Commits

Author SHA1 Message Date
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
Gregoire Parant
461dee776c Update css 2021-11-12 16:22:37 +01:00
Gregoire Parant
49f68451ae Update profile menu and change UX 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 15:31:49 +01:00
Gregoire Parant
d3f120f2bb Update to have token when user is connected 
- Update menu design

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 12:13:44 +01:00
_Bastler
72e7f1bdd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-10 19:31:44 +01:00
Gregoire Parant
1db22d82af Set state in local storage when openid provider redirect on jwt with token value 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-10 18:26:50 +01:00
David Négrier
ee4ec7ba97
Merge pull request #1555 from thecodingmachine/iconserver 
Add iconserver in services
 2021-11-10 18:12:47 +01:00
Alexis Faizeau
624593e425 Implement twemoji on emote 2021-11-10 16:55:20 +01:00
Alexis Faizeau
1c48feeb61 Add iconserver in services 2021-11-10 16:46:13 +01:00
Gregoire Parant
7406b62093 Add jwt token if is defined un URL 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-09 00:38:32 +01:00
Gregoire Parant
89baafba2f Rollback openid connect to use code and nonce 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-09 00:08:01 +01:00
_Bastler
0d811db668 latest dev 2021-11-05 18:44:33 +01:00
_Bastler
af855344f4 redo message trigger for co-websites 2021-11-03 17:30:13 +01:00
_Bastler
a3937fc17f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-03 11:21:41 +01:00
Alexis Faizeau
5a3d510f05 Create GameMapProperties index 2021-11-02 10:52:25 +01:00
_Bastler
a044afd34c fix cowebsite 2021-11-01 19:14:53 +01:00
_Bastler
00d9df1f4e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-01 17:51:12 +01:00
Alexis Faizeau
dbd6ce5bdc Fix player movement tests 2021-10-29 23:30:02 +02:00
Alexis Faizeau
d4470568ec Fix change layer api functions 2021-10-29 23:16:36 +02:00
_Bastler
47881a59ed Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-29 19:57:51 +02:00
_Bastler
6ed4a9bdc5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-29 19:57:47 +02:00
Alexis Faizeau
f4df12e5ff Cowebsite properties manage by layer and not by property index 2021-10-29 19:45:03 +02:00
Alexis Faizeau
934e24f837 Implement on enter/leave layer events 2021-10-29 19:44:58 +02:00
David Négrier
60a82c5eb2
Merge pull request #1516 from thecodingmachine/iframeManager 
Display multi co-websites
 2021-10-29 15:33:56 +02:00
Alexis Faizeau
e216b6caf4 Handle landscape mobile with cowebsite 2021-10-29 15:23:09 +02:00
_Bastler
7fb13cf54b santitize, popup class 2021-10-28 19:15:02 +02:00
Alexis Faizeau
68c626088d Add co-website icon on mobile landscape 2021-10-28 11:31:28 +02:00
_Bastler
24ac439fa1 default gameQuality 2021-10-27 19:30:42 +02:00
_Bastler
6a3d1fb1d5 login scene 2021-10-27 19:25:53 +02:00
_Bastler
178ba50876 fix login screen 2021-10-27 19:23:46 +02:00
_Bastler
07a02d9f16 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-27 19:17:23 +02:00
Gregoire Parant
6c0d8942e5 HotFix set last room for first connexion 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 16:48:33 +02:00
Gregoire Parant
f8ae189cee HotFix handler message in chat store 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 14:29:39 +02:00
Gregoire Parant
385ea1360e Type Chat message Store 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-27 10:02:47 +02:00
Alexis Faizeau
ab1a9b358a Change favicon snatcher http to https 2021-10-26 14:16:00 +02:00
Alexis Faizeau
fb7fe0dc0a Rename cowebsite API functions 2021-10-25 19:00:26 +02:00
Alexis Faizeau
fbff7491df Zoom x 2 thumbnail cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
f84c4b3276 Refacto insert cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
b81b1ff68b Implement new cowbesite system on API 2021-10-25 19:00:26 +02:00
Alexis Faizeau
c29c4bfaa4 Fix onChatMessage subscriber 2021-10-25 19:00:26 +02:00
Alexis Faizeau
da8cc661b7 Implement the new co website system 2021-10-25 19:00:26 +02:00
Alexis Faizeau
1ee0b28f66 Fix co website closing on exit zone 2021-10-25 19:00:26 +02:00
David Négrier
1efcbb4529
Merge pull request #1521 from thecodingmachine/change-player-depth 
Change character depth to 0
 2021-10-25 15:11:09 +02:00
_Bastler
89d8180cfe keep jitis circle 2021-10-22 09:40:16 +02:00
_Bastler
f984897e80 secure DISABLE_ANONYMOUS 2021-10-21 16:23:42 +02:00
_Bastler
a1338d40fb Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-18 15:02:22 +02:00
David Négrier
b6d571500e
Merge pull request #1528 from thecodingmachine/api_chat_multiple_virtual_users 
When there are many virtual users (generated by chat), only the name of a first user is displayed.
 2021-10-18 15:02:21 +02:00
David Négrier
4a40c08578 Fixing chat message attributed to wrong user 
When a new user entered a chat message, the message was still attributed to the last user who wrote.
 2021-10-18 14:58:29 +02:00
_Bastler
b74e122409 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-18 14:57:20 +02:00
David Négrier
4abf7208ff
Merge pull request #1524 from thecodingmachine/player-direction 
Display the real sprite direction on character loaded
 2021-10-18 14:37:01 +02:00
Alexis Faizeau
c13839ce8d Display the real sprite direction on character loaded 2021-10-15 16:35:42 +02:00
_Bastler
fd6b5220f0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:33:44 +02:00
David Négrier
958fc9eee8
Merge pull request #1523 from thecodingmachine/fix_back_forth_localhost 
Fixing exit problem on localhost maps
 2021-10-15 16:27:32 +02:00
David Négrier
70d5c7f658 Triggering onload even if file already loaded for files loaded via http:// 2021-10-15 16:14:17 +02:00
_Bastler
315be013e6 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:07:01 +02:00
grégoire parant
79e83d3782
Merge pull request #1522 from thecodingmachine/HotFixContactPage 
Fix share link for website
 2021-10-15 15:44:44 +02:00
Gregoire Parant
a8d6024352 Fix share link for website 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-15 15:25:23 +02:00
David Négrier
79a5916057 Removing dead code 2021-10-15 15:08:06 +02:00
Gregoire Parant
497a7c3467 Fix typo emails => email 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:33:53 +02:00
Alexis Faizeau
cdf4023928 Change character depth to 0 2021-10-14 17:32:27 +02:00
Gregoire Parant
b7692dd355 Fix local user useless 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:25:36 +02:00
Gregoire Parant
f87422187f HotFix user data connection 
Create local store for user connected in SSO

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:22:43 +02:00
_Bastler
78161bd98a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-13 10:30:12 +02:00
Kharhamel
726f52976d FEATURE: analytics client now scrape user email and room group 2021-10-11 16:30:01 +02:00
_Bastler
d5f61199c7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-11 13:03:20 +02:00
Kharhamel
57bfc1001f FIX: edited changelog 2021-10-11 11:34:10 +02:00
_Bastler
15766e521e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-10 10:30:04 +02:00
Kharhamel
59fa68e063 FIX: updated posthog client version and fixed a bug with its toolbar 2021-10-08 11:55:27 +02:00
_Bastler
448fd61426 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-07 15:01:11 +02:00
Kharhamel
60eefbce94
Merge pull request #1508 from thecodingmachine/fixSilentZones 
FIX: being in a silent zone new forces mediaConstraints to false
 2021-10-07 14:50:40 +02:00
Kharhamel
9dd3e8ff85 FIX: being in a silent zone new forces mediaConstraints to false 2021-10-06 17:59:20 +02:00
_Bastler
fa61e42b1d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-06 16:16:12 +02:00
_Bastler
51a774fb84 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-06 16:02:36 +02:00
grégoire parant
900c53f499
Update icon message and profile (#1504) 
- Add new icon profil pixel
 - Add new icon message pixel
 - Migrate message icon in svelt menu

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-06 15:36:42 +02:00
grégoire parant
358d9a79d3
Add condition Hash for start layer (#1506) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 23:34:18 +02:00
grégoire parant
908b78fdda
HotFix mandatory login with ADMIN openid connexion (#1503) 
Before anonymous connexion, we must get the details of the map and permit to check mandatory connexion and redirect user to login page.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 18:59:26 +02:00
_Bastler
f25cb6a3ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-04 20:57:12 +02:00
grégoire parant
b33e271d2e
Merge pull request #1499 from thecodingmachine/develop 
Release 1.5.3
 2021-10-04 20:54:13 +02:00
Kharhamel
02108ce977 FIX: fixes for the emnote menu 2021-10-04 14:43:19 +02:00
_Bastler
735c30b5a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-03 21:18:46 +02:00
Kharhamel
7bb0175648
FIX: we now make sure to completly disable the old stream before attempting to create a new one (#1493) 
* FIX: we now make sure to completly disable the old stream before attempting to create a new one

* FIX: disable audio optimization on chrome

* always reemit the stream on chrome

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Push fix microphone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-02 23:58:33 +02:00
Alexis Faizeau
8c3b708981
Remove audio manager range volume control by keys (#1489) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2021-10-02 15:55:54 +02:00
grégoire parant
1e69bb0f49
Manage redirect URL from admin and save in hydra via pusher (#1492) 
Add redirect parameter url to connect user directly on private openId application

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-30 11:16:25 +02:00
_Bastler
99619cf140 update dockerfile 2021-09-28 09:51:53 +02:00
_Bastler
bb7f83cee6 added world menu 2021-09-28 09:44:11 +02:00
David Négrier
2b5211d098
Merge pull request #1486 from thecodingmachine/fix-links 
Fixing links in the documentation
 2021-09-27 15:41:23 +02:00
David Négrier
b8996d5abb Fixing links in the documentation 2021-09-27 11:13:35 +02:00
Kharhamel
ce26294250 FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer 2021-09-24 11:54:19 +02:00
_Bastler
5e6ffd9fa2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-23 18:47:36 +02:00
Kharhamel
bf0c333266
Merge pull request #1463 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /front
 2021-09-23 18:36:51 +02:00
_Bastler
3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401) 
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 20:24:53 +02:00
_Bastler
d305a91ffd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 19:47:56 +02:00
Kharhamel
8b099e5725 FIX: added another catch case for default model 2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design (#1475) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-20 22:42:15 +02:00
_Bastler
d3a24b06c2 change room slug 2021-09-20 19:31:51 +02:00
_Bastler
0164d24329 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 16:25:25 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
_Bastler
49bd6f8a1c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 15:17:30 +02:00
_Bastler
31579283cd fix connection type 2021-09-20 15:06:44 +02:00
dependabot[bot]
8ecef9eadc
Bump axios from 0.21.1 to 0.21.2 in /front 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:07 +00:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte 
Twemoji emote menu svelte (upgrade of #1301)
 2021-09-20 14:33:16 +02:00
_Bastler
54346896b9 fix 2021-09-20 09:53:25 +02:00
_Bastler
1e43229956 fix? 2021-09-20 09:33:50 +02:00
_Bastler
afa12641aa undo 2021-09-20 09:30:36 +02:00
_Bastler
9650453edc quick fix 2021-09-20 09:27:18 +02:00
_Bastler
22c501e5e0 quick fix? 2021-09-20 09:24:47 +02:00
David Négrier
0ecabd14f1 Switching API to use type="module" scripts 
This allows using imports inside scripts imported by WorkAdventure out of the box (and therefore easily importing the scripting-api-extra without resorting to using a bundler)
 2021-09-20 09:14:14 +02:00
_Bastler
6af1651e03 remove instance, change room url, fix invalid lastRoomUrls 2021-09-20 08:56:14 +02:00
_Bastler
ccafaf11e3 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 08:55:41 +02:00
grégoire parant
8c96b514d4
HotFix to test hydra connexion (#1471) 2021-09-18 11:35:29 +02:00
_Bastler
0c16f08f4e fix quill build 2021-09-17 15:52:07 +02:00
_Bastler
7504580e43 fix quill.css 2021-09-17 15:47:17 +02:00
_Bastler
29b9d29b7d add quill css 2021-09-17 15:41:48 +02:00
_Bastler
ea64e79e46 fix localuser for OIDC 2021-09-17 14:02:43 +02:00
_Bastler
f053ece7da remove old, fix nginx 2021-09-17 10:23:00 +02:00
_Bastler
0bf49fa26a native OIDC support 2021-09-17 09:46:04 +02:00
_Bastler
3a9ffd7557 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 18:39:06 +02:00
_Bastler
b47201687a better we.bslty & deveop integration 2021-09-16 18:24:03 +02:00
Lurkars
63c4eeb4c7 Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:20:42 +02:00
Lurkars
7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
grégoire parant
553902e52a
Add log for Oauth login connexion (#1468) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-16 17:57:14 +02:00
Kharhamel
483191c521
Merge pull request #1458 from thecodingmachine/posthog 
FEATURE: added posthog as new analytics tool
 2021-09-16 15:24:27 +02:00
Kharhamel
2e111aa13a FEATURE: added posthog as new analytics tool 2021-09-16 15:16:10 +02:00
_Bastler
f69fe463de Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 16:52:39 +02:00
David Négrier
801ec3bf4c Turn off audio on exit 
If an exit zone is overlapping an audio zone, when exiting, the audio is stopped.
We do this by actually triggering the fact that a user should "leave" all active zones when exiting.
 2021-09-15 15:28:55 +02:00
_Bastler
63e756c1d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 13:08:33 +02:00
David Négrier
8a6419a3b7
Merge pull request #1457 from thecodingmachine/fix_yarn_not_working 
fix yarn install not working
 2021-09-15 11:50:50 +02:00
David Négrier
bb8583872b Fixing messages generation in Front container 2021-09-15 11:32:32 +02:00
David Négrier
0c374aba48
Merge pull request #1456 from thecodingmachine/jitsi-silent 
Fixing silent zone not respected when exiting Jitsi
 2021-09-15 11:27:50 +02:00
David Négrier
d26325d8dc Fixing silent zone not respected when exiting Jitsi 
Now, when a silent zone is adjacent to a Jitsi, it is enforced, even after leaving the Jitsi zone
 2021-09-15 11:16:23 +02:00
TabascoEye
5a855fb7e4
fix yarn install not working 
problem for virtually all people trying self-hosting according to #1433, #738 and likely more
 2021-09-15 10:43:01 +02:00
_Bastler
025722db63 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 18:38:00 +02:00
GRL78
680e538fd6
save button in settings close menu (#1451) 2021-09-14 16:43:00 +02:00
_Bastler
67d0802d1b Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 14:41:41 +02:00
David Négrier
9006283c90
Merge pull request #1452 from Lurkars/audioPlayerImprovements 
some fixes on the audio player controls
 2021-09-14 14:41:40 +02:00
_Bastler
b256431828 action message html 2021-09-14 13:08:25 +02:00
_Bastler
0067a8edc2 fix external resources for twemoji 2021-09-14 11:44:45 +02:00
Lurkars
8c780f07c6 fix font 2021-09-14 11:41:51 +02:00
Lurkars
f1bd92fa52 use included twemoji mozilla font instead of loading external 2021-09-14 11:39:36 +02:00
GRL
ff3e844b68 chat scroll to bottom when it open 2021-09-14 09:36:49 +02:00
_Bastler
148540dafe emojimenu, audiomanager 2021-09-14 08:56:37 +02:00
Lurkars
34d81b0e6c fix behaviour 2021-09-14 08:55:15 +02:00
Lurkars
91bc524e06 disable controls 2021-09-14 08:50:43 +02:00
_Bastler
cf69b3259a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 08:17:37 +02:00
Lurkars
beed50874b fix emotemenu on open jitsi rooms 2021-09-13 19:16:47 +02:00
David Négrier
f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
_Bastler
15404015f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:11:52 +02:00
David Négrier
f0b83663f6 Fixing broken sound controls 
Because of the rework of the menu, the clickable zone for the menu was extending at the complete top of the screen, which caused interactive items at the top of the screen (like sound controls) to be broken.

This commit fixes this.
 2021-09-13 10:06:08 +02:00
Lurkars
59c22c8dfc svelte check fix 2021-09-12 11:29:53 +02:00
Lurkars
e5b3088b5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-12 11:22:46 +02:00
Lurkars
3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
TabascoEye
94517c0f4b
add the possibilities of "onaction" and message to new "openTab" property 2021-09-10 23:17:04 +02:00
_Bastler
90f7258c9a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-10 17:14:59 +02:00
_Bastler
6c8d268b05 update Svelte twemoji 2021-09-10 17:11:37 +02:00
_Bastler
bb3b58d8bf Twemoji Svelte 2021-09-10 17:06:46 +02:00
Lurkars
e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Kharhamel
d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
Lurkars
d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
_Bastler
e5aef085fa Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 12:38:11 +02:00
_Bastler
2fd8eb3c91 fix flatten layers 2021-09-09 08:56:26 +02:00
Lurkars
36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
_Bastler
52489f9c72 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 08:25:41 +02:00
Gregoire Parant
3a3e5d5f3b Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
 2021-09-08 18:20:13 +02:00
GRL78
2ea7b0cff1
Menu style will adapt if iframe in map is opened (#1422) 2021-09-08 15:43:46 +02:00
grégoire parant
6cf86ec8dc
Add play uri for login and register in hydra (#1421) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-08 13:39:46 +02:00
_Bastler
bfc476fedd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 10:03:13 +02:00
kharhamel
fa9929757d FIX: reimplemented the old stream behavior on bad navigators like chrome 2021-09-07 16:39:44 +02:00
grégoire parant
f60678478b
Update right css (#1416) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-07 13:59:08 +02:00
_Bastler
4913010273 fix drinks 2021-09-06 20:15:41 +02:00
_Bastler
64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00
_Bastler
f320184d23 latest dev 2021-09-06 18:36:31 +02:00
kharhamel
4160235b92 ran pretty on the front 2021-09-06 14:31:59 +02:00
grégoire parant
bf1953fe22
Release v1.4.15 (#1411) 
* audio player volume improvements

* Add workaround for #932

* Bump striptags from 3.1.1 to 3.2.0 in /messages

Bumps [striptags](https://github.com/ericnorris/striptags) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ericnorris/striptags/releases)
- [Commits](https://github.com/ericnorris/striptags/compare/v3.1.1...v3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

* Add anthoer note for https://github.com/thecodingmachine/workadventure/issues/932#issuecomment-867562208

* WIP: svelte menu

* temp

* temp

* Bump tar from 4.4.13 to 4.4.15 in /back

Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.15.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.13...v4.4.15)

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

Signed-off-by: dependabot[bot] <support@github.com>

* New menu svelte

* Migration of report menu in svelte

* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu

* Suppression of HTML files that aren't use anymore

* New version of cache management (#1365)

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* migrate to svelte

* remove redundancy

* initial localUserStore volume

* Exit scene acess denied detected (#1369)

* Add auth token user to get right in admin and check if user have right

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update error show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update token generation (#1372)

- Permit only decode token to get map details,
 - If user have token expired, set the token to null and reload the page. This feature will be updated when authentication stategy will be finished.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* GameManager has an attribute scenePlugin

* GameManager has an attribute scenePlugin

* Suppression of gameManager in IframeListener

* fix deeployer

* fix deeployer

* Fixing enter/leave event not properly sent on adjacent zones

On adjacent zones, the zone leave event was not properly triggered when leaving a zone for the zone next to it.
Closes #1366

* First pass on css

* First pass on css

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Improving popup

If a popup message is empty, only the buttons will be displayed (not the container)

Unrelated: the Sound.play method in the API now accepts 0 arguments.

* Third pass on css and reportMenu

* Correction following test

* Player return a the same position when after editing his profile

* Player return a the same position when after editing his profile (same as reconnection)

* Contact page only if environment variable exist

* Execute scripts of the map after creating gameScene

* Rollback on createPromise switched to public

* Bump tar from 6.1.0 to 6.1.10 in /pusher

Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.10.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.0...v6.1.10)

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

Signed-off-by: dependabot[bot] <support@github.com>

* Add iframe submenu by scripting API
Delete menu by scripting API

* Removing ts-ignore

* REVIEW : Migration Menu and Report Menu in Svelte (#1363)

* WIP: svelte menu

* temp

* temp

* New menu svelte

* Migration of report menu in svelte

* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu

* Suppression of HTML files that aren't use anymore

* fix deeployer

* First pass on css

* First pass on css

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Third pass on css and reportMenu

* Correction following test

* Contact page only if environment variable exist

* Update service worker

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change requested

* Change requested

Co-authored-by: kharhamel <oognic@gmail.com>
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Refactor to only have one function registerMenuCommand
When selected custom menu is removed, go to settings menu
Allow iframe in custom menu to use Scripting API
Return menu object when it is registered, can call remove function on it

* Correct bad change

* Add types file in API

* Add types file in API

* Fixing "has/in" on variables proxy object

When using WA.state, using `"myVariable" in WA.state` would always return false.
This is now fixed by adding a "has" method on the Proxy class.

Also, added a `WA.state.hasVariable` method.

* Add documentation
delete unused test map

* Properties changed via the Iframe API now trigger changes directly

Changes performed in WA.room.setPropertyLayer now have a real-time impact.
If the property is changed on a layer the current player is on, the changes will be triggered.

* documentation and CHANGELOG

* add possibility to set size of coWebsite and Jitsis via map property

* Update GameScene.ts

typo fixed

* Update CoWebsiteManager.ts

typos and style

* Update CoWebsiteManager.ts

yet another typo

* FIX: media tracks were not readded to a 3rd person in some situations

* fix ReportMenu (#1397)

* remove the package systeminformation from back

* Bump url-parse from 1.5.1 to 1.5.3 in /front

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump tar from 4.4.15 to 4.4.19 in /back

Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.19)

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

Signed-off-by: dependabot[bot] <support@github.com>

* Bump path-parse from 1.0.6 to 1.0.7 in /messages

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* openTabPropertyKey (create new props in own file)

* Bump path-parse from 1.0.6 to 1.0.7 in /uploader

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump path-parse from 1.0.6 to 1.0.7 in /front

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump path-parse from 1.0.6 to 1.0.7 in /back

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump path-parse from 1.0.6 to 1.0.7 in /maps

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* FEATURE: improved the mediaStore code to disable tracks instead of deleting them

* Bump path-parse from 1.0.6 to 1.0.7 in /benchmark

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* added jitsiTypes

* renamed

* Allowing variables nested in group layers

Up until this commit, variables nested in object layers inside group layers where not found by the front nor the back.
This PR changes analysis so that variables can be detected.

* FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore()

* WIP: Bypass camera scene (#1337)

* Set new local camera setup variable

* Finish by pass video settings

 - TODO add button to update camera settings

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Merge branch 'develop' into jumpVideoCamera

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/LocalUserStore.ts
#	front/src/Phaser/Components/Loader.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Login/EnableCameraScene.ts

* Add menu to open enable camera scene

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish jump camera setup

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Active authentication Oauth (#1377)

* Active authentication Oauth

 - Google authentication
 - GitHub authentication
 - Linkedin authentication

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish connexion et get user info connexion

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix lint error

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change the expires token for 30 days

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update connexion stratgey

 - Set last room when it will be created and not when connexion is openned
 - Add '/login' end point permit to logout and open iframe to log user
 - Add logout feature permit to logout in front

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Implement logout and revoke token with hydra

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix pull develop conflict

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile url (#1399)

* Create function that permit to get profile URL

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Continue profil user

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Add menu and logout button

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update last room use

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile callback permit to get url profile setting from admin

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish profile show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete profileUrl will be not use today

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Correct lint

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update size of iframe

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete console log

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update feedback ARP

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Emote silent zone (#1342)

* Add an emote when the user is in silent zone

* Update silent icon strategy

* Update strategy for silent zone

 - Add svelte store
 - Show silent zone indication and replace camera

This update permit to hide silent zone when user is in Jitsi discussion

* Fix css silent zone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Hotfix media constraint error

 - Create error to manage displayed warning when we try to access on media with no constraint video and audio
 - Fix disabled microphone if we try to active and we don't have right or there is an error.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

Co-authored-by: Lurkars <git@8lh.de>
Co-authored-by: Guy Sheffer <guysoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kharhamel <oognic@gmail.com>
Co-authored-by: GRL <g.lesniewski@thecodingmachine.com>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: GRL78 <80678534+GRL78@users.noreply.github.com>
Co-authored-by: ¯\_(ツ)_/¯ <tabascoeye@gmail.com>
Co-authored-by: Kharhamel <Kharhamel@users.noreply.github.com>
Co-authored-by: jonny <ga86lad@mytum.de>
 2021-09-05 19:51:33 +02:00
Gregoire Parant
f2ca021740 Hotfix media constraint error 
- Create error to manage displayed warning when we try to access on media with no constraint video and audio
 - Fix disabled microphone if we try to active and we don't have right or there is an error.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-05 19:36:57 +02:00
grégoire parant
4f0bb95a38
Emote silent zone (#1342) 
* Add an emote when the user is in silent zone

* Update silent icon strategy

* Update strategy for silent zone

 - Add svelte store
 - Show silent zone indication and replace camera

This update permit to hide silent zone when user is in Jitsi discussion

* Fix css silent zone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-05 18:36:22 +02:00
grégoire parant
d2b8d7dc04
Active authentication Oauth (#1377) 
* Active authentication Oauth

 - Google authentication
 - GitHub authentication
 - Linkedin authentication

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish connexion et get user info connexion

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix lint error

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change the expires token for 30 days

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update connexion stratgey

 - Set last room when it will be created and not when connexion is openned
 - Add '/login' end point permit to logout and open iframe to log user
 - Add logout feature permit to logout in front

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Implement logout and revoke token with hydra

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Fix pull develop conflict

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile url (#1399)

* Create function that permit to get profile URL

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Continue profil user

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Add menu and logout button

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update last room use

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Profile callback permit to get url profile setting from admin

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish profile show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete profileUrl will be not use today

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Correct lint

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update size of iframe

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Delete console log

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update feedback ARP

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-05 18:17:49 +02:00
grégoire parant
a0d863569b
WIP: Bypass camera scene (#1337) 
* Set new local camera setup variable

* Finish by pass video settings

 - TODO add button to update camera settings

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Merge branch 'develop' into jumpVideoCamera

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/LocalUserStore.ts
#	front/src/Phaser/Components/Loader.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Login/EnableCameraScene.ts

* Add menu to open enable camera scene

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Finish jump camera setup

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-04 21:31:36 +02:00
_Bastler
22ff1cc82e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 19:31:40 +02:00
kharhamel
ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
_Bastler
b539d95fec Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 12:52:17 +02:00
Kharhamel
6cb0f14e5a
Merge pull request #919 from Lurkars/audioPlayerImprovements 
audio player volume improvements
 2021-09-03 11:50:23 +02:00
_Bastler
62e164de9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-02 19:18:25 +02:00
David Négrier
86858a176e
Merge pull request #1406 from thecodingmachine/fix/recursive_variables 
Allowing variables nested in group layers
 2021-09-02 18:37:27 +02:00
David Négrier
68a4772627 Allowing variables nested in group layers 
Up until this commit, variables nested in object layers inside group layers where not found by the front nor the back.
This PR changes analysis so that variables can be detected.
 2021-09-02 18:05:55 +02:00
Kharhamel
8d2da6bdc7
Merge pull request #1405 from jonnytest1/opentab2 
openTabPropertyKey (create new props in own file)
 2021-09-02 17:19:20 +02:00
Lurkars
49b1a55042 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-09-01 19:25:37 +02:00
_Bastler
8715781bbd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 19:24:26 +02:00
jonny
606e9093e1 renamed 2021-09-01 18:16:31 +02:00
jonny
181232c1e6 added jitsiTypes 2021-09-01 17:55:23 +02:00
Kharhamel
93238abd76
Merge pull request #1361 from thecodingmachine/dependabot/npm_and_yarn/front/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /front
 2021-09-01 17:47:34 +02:00
Kharhamel
095a486621
Merge pull request #1402 from thecodingmachine/betterMEdiaStore 
FEATURE: improved the mediaStore code to disable tracks instead of deleting them
 2021-09-01 17:30:59 +02:00
kharhamel
52fe79df47 FEATURE: improved the mediaStore code to disable tracks instead of deleting them 2021-09-01 17:14:05 +02:00
dependabot[bot]
3f143ba912
Bump path-parse from 1.0.6 to 1.0.7 in /front 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 13:10:14 +00:00
_Bastler
29b790ec32 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 14:58:52 +02:00
jonny
0272e4f691 merged in develop again 2021-09-01 14:55:29 +02:00
jonny
7971daa27f openTabPropertyKey (create new props in own file) 2021-09-01 14:50:48 +02:00
Kharhamel
ad60993b9a
Merge pull request #1398 from tabascoeye/develop 
add possibility to set size of coWebsite and Jitsis via map property
 2021-09-01 14:42:41 +02:00
dependabot[bot]
96ff1f3af1
Bump url-parse from 1.5.1 to 1.5.3 in /front 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 12:23:36 +00:00
_Bastler
9e459748bf Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 12:05:30 +02:00
GRL78
19baf7f582
fix ReportMenu (#1397) 2021-09-01 10:11:12 +02:00
_Bastler
8ab4b5b80c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-31 21:02:33 +02:00
kharhamel
1e20466f74 FIX: media tracks were not readded to a 3rd person in some situations 2021-08-31 16:29:23 +02:00
TabascoEye
a0d73f27d9
Update CoWebsiteManager.ts 
yet another typo
 2021-08-30 19:51:14 +02:00
TabascoEye
e6ae343975
Update CoWebsiteManager.ts 
typos and style
 2021-08-30 19:44:50 +02:00
TabascoEye
da03e60de4
Update GameScene.ts 
typo fixed
 2021-08-30 19:42:18 +02:00
¯\_(ツ)_/¯
ae3e2a09d9 add possibility to set size of coWebsite and Jitsis via map property 2021-08-30 19:32:02 +02:00
_Bastler
a633f79dd7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 20:19:30 +02:00
David Négrier
d2816220eb
Merge pull request #1395 from thecodingmachine/triggerOnSetLayer 
Properties changed via the Iframe API now trigger changes directly
 2021-08-27 17:41:58 +02:00
David Négrier
7576fbbe6d
Merge pull request #1392 from thecodingmachine/iframeMenuScript 
Iframe menu script
 2021-08-27 17:41:04 +02:00
David Négrier
10c08dea6d
Merge pull request #1393 from thecodingmachine/variableHasProxy 
Fixing "has/in" on variables proxy object
 2021-08-27 15:07:50 +02:00
David Négrier
4536a63e69 Properties changed via the Iframe API now trigger changes directly 
Changes performed in WA.room.setPropertyLayer now have a real-time impact.
If the property is changed on a layer the current player is on, the changes will be triggered.
 2021-08-27 15:05:14 +02:00
David Négrier
a0d3685227 Fixing "has/in" on variables proxy object 
When using WA.state, using `"myVariable" in WA.state` would always return false.
This is now fixed by adding a "has" method on the Proxy class.

Also, added a `WA.state.hasVariable` method.
 2021-08-27 11:29:59 +02:00
GRL
706f531ca2 Add types file in API 2021-08-27 11:17:48 +02:00
GRL
a195870cfb Correct bad change 2021-08-27 11:12:23 +02:00
GRL
833c15b2d5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframeMenuScript 2021-08-27 10:44:32 +02:00
_Bastler
20cee5cb12 migrate from latest dev 2021-08-27 10:40:50 +02:00
_Bastler
e806325da9 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 10:40:30 +02:00
GRL
cf7bfe79ca Refactor to only have one function registerMenuCommand 
When selected custom menu is removed, go to settings menu
Allow iframe in custom menu to use Scripting API
Return menu object when it is registered, can call remove function on it
 2021-08-27 10:34:03 +02:00
GRL78
7c956d1481
REVIEW : Migration Menu and Report Menu in Svelte (#1363) 
* WIP: svelte menu

* temp

* temp

* New menu svelte

* Migration of report menu in svelte

* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu

* Suppression of HTML files that aren't use anymore

* fix deeployer

* First pass on css

* First pass on css

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Third pass on css and reportMenu

* Correction following test

* Contact page only if environment variable exist

* Update service worker

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change requested

* Change requested

Co-authored-by: kharhamel <oognic@gmail.com>
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-26 12:01:07 +02:00
David Négrier
5cd3ab4b4c Removing ts-ignore 2021-08-25 09:30:05 +02:00
GRL
f3c4d344b3 Add iframe submenu by scripting API 
Delete menu by scripting API
 2021-08-24 17:35:06 +02:00
_Bastler
f0a60d3907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-24 11:50:11 +02:00
Gregoire Parant
54fab3d233 Merge branch 'master' into develop 2021-08-24 10:45:03 +02:00
GRL
49eb28dacf Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-24 09:38:24 +02:00
_Bastler
2ce9451f2f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-23 19:31:49 +02:00
David Négrier
8c43c2e6e8 Rollback on createPromise switched to public 2021-08-23 18:54:00 +02:00
GRL
ad95fa5e11 Execute scripts of the map after creating gameScene 2021-08-23 18:53:59 +02:00
David Négrier
bf6ce94b80 Merge branch 'develop' of github.com:thecodingmachine/workadventure into samePlaceAfterEditProfile 2021-08-23 18:04:09 +02:00
GRL
2f76a24dff Contact page only if environment variable exist 2021-08-23 17:30:07 +02:00
Gregoire Parant
99a9b5f9a2 Update strategy to use css 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 10:20:48 +02:00
Gregoire Parant
8c4ead8421 Add "\n\r" to match 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:43:43 +02:00
Gregoire Parant
da00fa7868 Update escapeHtml 
Update escapeHtml in HtmlUtils class to create paragraphe when user have \r\n in popup text

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:16:22 +02:00
_Bastler
9790572928 typo 2021-08-23 09:07:07 +02:00
GRL
edfe440c6e Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-20 16:18:45 +02:00
_Bastler
092a14fa09 update front docker: stun 2021-08-20 12:49:12 +02:00
_Bastler
94328771bf update production docker stuff 2021-08-20 12:30:33 +02:00
GRL
c2b3d23ec0 Player return a the same position when after editing his profile (same as reconnection) 2021-08-20 09:49:37 +02:00
_Bastler
e82de52a35 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-19 19:24:24 +02:00
Gregoire Parant
4d4c9c8c6e Merge branch 'master' into develop 2021-08-19 18:50:34 +02:00
grégoire parant
e32f433688
Update cache version (#1383) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-19 18:48:24 +02:00
Gregoire Parant
86c32cf9ff Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/dist/service-worker-prod.js
 2021-08-19 18:31:30 +02:00
grégoire parant
1ffd198b00
Update cache management (#1382) 
Change strategy of cache management. Today we don't have version of map building so we cannot use cache correctly. The idea is to have a less cache and keep HTPP cache management with GET method.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-19 18:23:30 +02:00
GRL
0c796dff90 Player return a the same position when after editing his profile 2021-08-19 17:22:16 +02:00
GRL
2ebf05f7d6 Correction following test 2021-08-19 11:17:46 +02:00
_Bastler
6ff4f4f52e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-19 10:36:23 +02:00
_Bastler
4dfc04826e production tests 2021-08-19 10:09:42 +02:00
GRL
d6bd883c94 Third pass on css and reportMenu 2021-08-18 15:34:26 +02:00
David Négrier
8a64491952 Improving popup 
If a popup message is empty, only the buttons will be displayed (not the container)

Unrelated: the Sound.play method in the API now accepts 0 arguments.
 2021-08-18 11:53:41 +02:00
GRL
5a8e7d277f Second pass on css and reportMenu 2021-08-18 11:30:11 +02:00
GRL
4c3097155b Second pass on css and reportMenu 2021-08-18 11:15:46 +02:00
_Bastler
fc567e76f4 update dependencies, Iframe module loading 2021-08-17 20:33:20 +02:00
GRL
9e5cc3b9a7 First pass on css 2021-08-17 15:17:29 +02:00
GRL
096baa8897 First pass on css 2021-08-17 14:44:43 +02:00
grégoire parant
0bfac1a164
Update cache API index (#1378) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-17 13:26:20 +02:00
_Bastler
123d6fd535 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-17 11:40:32 +02:00
David Négrier
06be65c12f
Merge pull request #1368 from thecodingmachine/fix_zone_enter_exit 
Fixing enter/leave event not properly sent on adjacent zones
 2021-08-17 10:08:51 +02:00
David Négrier
1d45bab46d Fixing enter/leave event not properly sent on adjacent zones 
On adjacent zones, the zone leave event was not properly triggered when leaving a zone for the zone next to it.
Closes #1366
 2021-08-17 10:04:11 +02:00
_Bastler
940b08742a fix audiomanager 2021-08-16 19:37:26 +02:00
_Bastler
1958449178 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-16 19:21:09 +02:00
GRL
aa9e5c4543 Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-16 14:19:28 +02:00
GRL
151e63ff91 Suppression of gameManager in IframeListener 2021-08-16 11:56:00 +02:00
GRL
d2413896c7 GameManager has an attribute scenePlugin 2021-08-16 11:50:09 +02:00
grégoire parant
005a3c5a0d
Release 1.4.14 (#1370) 
* New version of cache management (#1365)

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Exit scene acess denied detected (#1369)

* Add auth token user to get right in admin and check if user have right

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update error show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update token generation (#1372)

- Permit only decode token to get map details,
 - If user have token expired, set the token to null and reload the page. This feature will be updated when authentication stategy will be finished.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-15 23:13:48 +02:00
grégoire parant
8d57886bae
Update token generation (#1372) 
- Permit only decode token to get map details,
 - If user have token expired, set the token to null and reload the page. This feature will be updated when authentication stategy will be finished.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-15 22:51:06 +02:00
_Bastler
1fd5c146e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-15 17:46:54 +02:00
grégoire parant
02a21209ec
Exit scene acess denied detected (#1369) 
* Add auth token user to get right in admin and check if user have right

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Update error show

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-15 08:51:35 +02:00
_Bastler
1141272165 add module loading 2021-08-13 10:00:34 +02:00
_Bastler
0365fcb24d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-13 07:56:22 +02:00
Lurkars
aa38d1a5bd initial localUserStore volume 2021-08-11 20:29:48 +02:00
Lurkars
0d27b4ad43 remove redundancy 2021-08-11 20:07:09 +02:00
Lurkars
3702173cd4 migrate to svelte 2021-08-11 20:01:51 +02:00
Lurkars
e8104f63ac Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-08-11 19:55:36 +02:00
grégoire parant
f7daf16ac5
New version of cache management (#1365) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-11 17:09:17 +02:00
GRL
f4ce5f9a3b Merge branch 'ReportMenuSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-11 15:04:47 +02:00
GRL
46a2e3f453 Suppression of HTML files that aren't use anymore 2021-08-11 14:23:34 +02:00
GRL
e86892b9a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-11 14:13:31 +02:00
GRL
8105e966ff Migration of registerCustomMenu for Menu in Svelte 
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu
 2021-08-11 14:07:34 +02:00
_Bastler
9c7c1e091a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-11 12:10:44 +02:00
Gregoire Parant
45a56c2e02 HotFix feedback svelte continuous integration 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-11 10:09:04 +02:00
Gregoire Parant
434b112c65 Improve service worker store managment 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-11 10:01:56 +02:00
grégoire parant
bced495570
Add comment use service worker (#1355) 2021-08-10 23:10:56 +02:00
grégoire parant
c7fdfed00c
Improve mobile camera shown (#1354) 
- Add new store to send mobile size
 - Update style to show video for mobile size
 2021-08-10 22:35:26 +02:00
grégoire parant
22a46a98ea
Improve service worker (#1353) 
* Improve service worker

 - Add new env variable in WebPack "NODE_ENV"
 - Add new service worker for mode dev that permit to by pass response in cache storage
 - Add new WorkAdventure icon

* Remove console.log

* Add service worker file prod and dev
 2021-08-10 22:34:46 +02:00
_Bastler
27d331ea37 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-10 10:25:24 +02:00
grégoire parant
1db2e2aba9
Update style of microphone (#1352) 
- Active microphone close when user haven't microphone in the discussion
 2021-08-10 10:12:31 +02:00
GRL
9c1926f636 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-09 16:59:12 +02:00
GRL
d10e2dbca7 Migration of report menu in svelte 2021-08-09 16:56:28 +02:00
GRL
56fa2e49f6 New menu svelte 2021-08-09 14:49:17 +02:00
_Bastler
73a2cec4df merge 2021-08-08 15:47:53 +02:00
Gregoire Parant
af613f5b5b Merge branch 'master' into develop 2021-08-06 15:53:33 +02:00
GRL78
e0fb31fc58
WIP: Migrate AudioManager in Svelte (#1325) 
* Migrate AudioManager in Svelte

* use import type when needed
 2021-08-06 09:11:17 +02:00
_Bastler
e9e96c9e30 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-05 20:46:42 +02:00
David Négrier
ac282db1ac Removing pointless console.log 2021-08-05 17:21:55 +02:00
David Négrier
6b9b999996 Making embedded iframes scriptable using the WA.room.website namespace. 2021-08-05 12:37:05 +02:00
David Négrier
5bb29e99ba Adding a "allowApi" property to authorize the API in a website. 2021-08-05 12:30:07 +02:00
David Négrier
ce3c53ae3f Adding the ability to inject websites directly inside maps 
This PR adds the ability to inject a website INSIDE a map (as an iframe inside a Phaser HTML object)
The iFrame will be rendered transparently, unless you set a background-color on the body, which opens a number of cool possibilities.

Needs to be done: allowing the iframe API in those iframes.
 2021-08-05 12:30:05 +02:00
David Négrier
570110f831 Fixing openWebsiteTriggerMessage not hidden when moving out of zone. 2021-08-05 12:07:12 +02:00
David Négrier
bc1c6a4986 Refactoring displayActionMessage signature. Now accepting an options object. This should allow for more options in the future. 2021-08-05 12:02:00 +02:00
David Négrier
87e4367455 Refactoring layoutManagerActionStore. It now supports an uuid field. 
layoutManagerVisibilityStore is now a derived field from layoutManagerActionStore.
 2021-08-05 11:19:28 +02:00
GRL
2cd5b7f0a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-05 10:01:23 +02:00
David Négrier
92fee33b64 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-05 09:24:05 +02:00
David Négrier
d1e5d57459 Changing the method name from "triggerMessage" to "displayActionMessage". 
Generally speaking, I like to call the message at the bottom an "action message".
And things can "trigger" it, but in the case of a method that actually proactively displays the message, I find "displayActionMessage" to be a better name.

Also, removing package-lock files and improving code style
 2021-08-05 09:17:33 +02:00
Gregoire Parant
190007a21f Fix joystick postion 
- Aply new size after open and close iframe and permit to keep the good position of the joystick on the WorkAdventure screen
 2021-08-04 18:07:04 +02:00
_Bastler
d046460d76 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-04 18:02:49 +02:00
Gregoire Parant
f9992876df Update PWA apple icon 2021-08-04 15:05:11 +02:00
Gregoire Parant
383bbbdafe Force to add service worker js file 2021-08-04 14:31:12 +02:00
Gregoire Parant
707040b506 improve PWA and last room strating 2021-08-04 13:33:58 +02:00
David Négrier
4713010929 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-03 19:01:16 +02:00
Gregoire Parant
1ad9f5b045 Add new icon manifest 2021-08-03 17:49:25 +02:00
Gregoire Parant
d781b2eb91 Update favicon and service worker html 2021-08-03 17:28:27 +02:00
GRL
fe585297fc Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-03 17:19:47 +02:00
GRL
2d8098b06d Merge branch 'develop' of github.com:thecodingmachine/workadventure into layoutManagerSvelte 2021-08-03 11:40:51 +02:00
GRL
1436b15328 Migrate layoutManager in Svelte 2021-08-03 11:13:08 +02:00
Gregoire Parant
952e58ecc1 Fix ban message style 2021-08-03 00:34:07 +02:00
Gregoire Parant
14b4229019 Merge branch 'develop' into GlobalMessageToWorld 
# Conflicts:
#	CHANGELOG.md
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Components/App.svelte
#	pusher/src/Services/SocketManager.ts
 2021-08-02 23:07:39 +02:00
Gregoire Parant
2480d13f58 Merge branch 'master' into develop 2021-08-02 22:26:34 +02:00
Gregoire Parant
e07f4bf96f Add comment 2021-08-02 22:24:00 +02:00
Gregoire Parant
f2d382681b Merge branch 'develop' into loadTileset 
# Conflicts:
#	CHANGELOG.md
#	front/src/Phaser/Game/GameScene.ts
 2021-08-02 22:16:05 +02:00
Gregoire Parant
7bd444ade9 Revert "Squashed commit of the following:" 
This reverts commit c177f0a1b3.
 2021-08-02 22:13:10 +02:00
Gregoire Parant
c177f0a1b3 Squashed commit of the following: 
commit 41748a4036
Merge: 3b1d4d63 4991a70b
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:38:37 2021 +0200

    Merge pull request #1327 from thecodingmachine/hotFixErrorCardBack

    Fix error generated

commit 4991a70bba
Author: Gregoire Parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:34:03 2021 +0200

    Fix error generated

    Don't generate error if file is Invalid

commit 3b1d4d630c
Merge: f52b4598 02e5860e
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 21:03:18 2021 +0200

    Merge pull request #1326 from thecodingmachine/HotFixCreateMapFeature

    Hot fix create map feature

commit 02e5860e43
Author: Gregoire Parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 20:59:13 2021 +0200

    HotFix redirect on production domain of WorkAdventure

     - Update domain `ADMIN_URL` by `workadventu.re`

commit f52b459872
Merge: 3d657b4a 3ab069d6
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Mon Aug 2 11:23:16 2021 +0200

    Merge pull request #1324 from thecodingmachine/develop

    Release v1.4.11

commit 3ab069d650
Merge: 2b748138 9d4ffe54
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 15:51:07 2021 +0200

    Merge pull request #1323 from thecodingmachine/openIDPoc

    FIX: bomp the node version of pusher

commit 9d4ffe542c
Author: kharhamel <oognic@gmail.com>
Date:   Fri Jul 30 15:50:30 2021 +0200

    FIX: bomp the node version of pusher

commit 2b7481383f
Merge: 74975ac9 9c803a69
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 15:48:56 2021 +0200

    Merge pull request #1251 from thecodingmachine/openIDPoc

    POC for the openID connect

commit 9c803a69ff
Author: kharhamel <oognic@gmail.com>
Date:   Tue Jul 27 16:37:01 2021 +0200

    FEATURE: users can now login via an openID client

commit 74975ac9d8
Merge: 315fe7ca ebdcf880
Author: Kharhamel <Kharhamel@users.noreply.github.com>
Date:   Fri Jul 30 14:54:33 2021 +0200

    Merge pull request #1322 from thecodingmachine/improveCapacityWarning

    FEATURE: improved the room capacity warning visuals

commit ebdcf8804d
Author: kharhamel <oognic@gmail.com>
Date:   Fri Jul 30 14:08:27 2021 +0200

    added admin link to the warning container

commit 41ac51f291
Author: kharhamel <oognic@gmail.com>
Date:   Thu Jul 29 18:02:36 2021 +0200

    FEATURE: improved the room capacity warning visuals

commit 315fe7ca82
Author: David Négrier <d.negrier@thecodingmachine.com>
Date:   Thu Jul 29 17:49:51 2021 +0200

    Adding a "font-family" property for text objects. (#1311)

    - Tiled displays your system fonts.
    - Computers have different sets of fonts. Therefore, browsers never rely on system fonts
    - Which means if you select a font in Tiled, it is quite unlikely it will render properly in WorkAdventure

    To circumvent this problem, in your text object in Tiled, you can now add an additional property: `font-family`.

    The `font-family` property can contain any "web-font" that can be loaded by your browser.

    This allows us to use the "Press Start 2P" 8px font in text objects, which renders way better than the default "Sans serif" font of your browser.

commit 7ffe564e8e
Author: GRL78 <80678534+GRL78@users.noreply.github.com>
Date:   Thu Jul 29 17:42:16 2021 +0200

    Graphic upgrade of the global message console (#1287)

    * Graphic upgrade of the global message console
    Fix: error if LoginScene doesn't exist

    * Rework graphic of global message console

    * Rework graphic of global message console

    * Remove console.log

commit 2a1af2a131
Author: grégoire parant <g.parant@thecodingmachine.com>
Date:   Thu Jul 29 16:42:31 2021 +0200

    PWA service workers (#1319)

    * PWA services worker

    - [x] Register service worker of PWA to install WorkAdventure application on desktop and mobile
    - [x] Create webpage specifique for PWA
    - [ ] Add register service to save and redirect on a card
    - [ ] Add possibilities to install PWA for one World (with register token if existing)

    * Finish PWA strategy to load last map visited

    * Fix feedback @Kharhamel

    * Fix feedback @Kharhamel
 2021-08-02 22:06:24 +02:00
Gregoire Parant
02e5860e43 HotFix redirect on production domain of WorkAdventure 
- Update domain `ADMIN_URL` by `workadventu.re`
 2021-08-02 20:59:13 +02:00
kharhamel
9c803a69ff FEATURE: users can now login via an openID client 2021-07-30 15:43:46 +02:00
Kharhamel
74975ac9d8
Merge pull request #1322 from thecodingmachine/improveCapacityWarning 
FEATURE: improved the room capacity warning visuals
 2021-07-30 14:54:33 +02:00
kharhamel
ebdcf8804d added admin link to the warning container 2021-07-30 14:50:11 +02:00
GRL
bd96a32d5b Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-30 09:38:28 +02:00
kharhamel
41ac51f291 FEATURE: improved the room capacity warning visuals 2021-07-29 18:27:53 +02:00
GRL
6ac25d344b Use const 2021-07-29 17:56:28 +02:00
_Bastler
617435ea4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-29 17:54:15 +02:00
David Négrier
315fe7ca82
Adding a "font-family" property for text objects. (#1311) 
- Tiled displays your system fonts.
- Computers have different sets of fonts. Therefore, browsers never rely on system fonts
- Which means if you select a font in Tiled, it is quite unlikely it will render properly in WorkAdventure

To circumvent this problem, in your text object in Tiled, you can now add an additional property: `font-family`.

The `font-family` property can contain any "web-font" that can be loaded by your browser.

This allows us to use the "Press Start 2P" 8px font in text objects, which renders way better than the default "Sans serif" font of your browser.
 2021-07-29 17:49:51 +02:00
GRL78
7ffe564e8e
Graphic upgrade of the global message console (#1287) 
* Graphic upgrade of the global message console
Fix: error if LoginScene doesn't exist

* Rework graphic of global message console

* Rework graphic of global message console

* Remove console.log
 2021-07-29 17:42:16 +02:00
_Bastler
dcc67b1521 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-29 17:01:58 +02:00
_Bastler
ff686cf025 merge latest dev 2021-07-29 17:01:13 +02:00
grégoire parant
2a1af2a131
PWA service workers (#1319) 
* PWA services worker

- [x] Register service worker of PWA to install WorkAdventure application on desktop and mobile
- [x] Create webpage specifique for PWA
- [ ] Add register service to save and redirect on a card
- [ ] Add possibilities to install PWA for one World (with register token if existing)

* Finish PWA strategy to load last map visited

* Fix feedback @Kharhamel

* Fix feedback @Kharhamel
 2021-07-29 16:42:31 +02:00
GRL
eb8404ac91 Initialise iframeListener in preload 
Add documentation and CHANGELOG
 2021-07-29 15:53:27 +02:00
GRL
5f7361156b Merge branch 'develop' of github.com:thecodingmachine/workadventure into loadTileset 2021-07-29 15:35:32 +02:00
GRL
897a01bb79 Loading a tileset create a new GameMap 2021-07-29 14:14:40 +02:00
GRL
73d589ad11 Load a json file that describe a tileset in Tile format. 
Then add it to the tilemap of the GameScene
Then add if to the GameMap
 2021-07-28 18:03:19 +02:00
_Bastler
b2d1ace0ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 13:25:26 +02:00
Gregoire Parant
4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +02:00
_Bastler
3c52bb3dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 08:25:52 +02:00
Stefan Weil
64065b2798
Fix some typos (found by codespell) (#1316) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2021-07-27 14:29:09 +02:00
GRL78
95af568653
Link will now be white and underline + Click on the game to lose focus of input field (#1315) 
* Link will now be white and underline
Click on the game to lose focus of input field

* Use bind:this instead of querySelector
Add isClickedInside and isClickedOutside to HtmlUtils to know if the user click inside/outside an element targeted
 2021-07-27 14:28:35 +02:00
grégoire parant
fc9865e273
HotFix position WOKA (#1317) 
- Fix the moving position when a user enters in "custom your own" with custom WOKA loaded from admin
 2021-07-27 14:28:00 +02:00
David Négrier
cdd61bdb2c Merging with develop 2021-07-23 16:41:38 +02:00
GRL
9e8bed7aab Position of quill tooltip 
Use inlineStyle to indent and align text correctly
 2021-07-23 16:17:53 +02:00
David Négrier
3d5c222957 Reverting changes regarding single quotes 2021-07-23 14:59:56 +02:00
David Négrier
a146065cc6 Reverting changes regarding single quotes 2021-07-23 14:55:14 +02:00
GRL
ba6e6235d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-23 14:10:43 +02:00
_Bastler
07b3dc0f5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-23 12:18:30 +02:00
David Négrier
2aba6b1c27 Fixing loop when setting variables 
Setting a variable would makes the application enter in an infinite loop of events (between all the scripts and the back)
This fix makes sure a variable does not emit any event if it is changed to a value it already has.
 2021-07-23 11:51:01 +02:00
GRL
807abaa2c0 Text global message use delta instead of text 2021-07-23 11:07:17 +02:00
_Bastler
b6693b9ea7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 18:41:01 +02:00
GRL
9fa7c7aac0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 17:29:00 +02:00
David Négrier
84df25f863 Improving WA.state typings 2021-07-22 17:14:36 +02:00
GRL
68ff1b9e17 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 16:26:01 +02:00
GRL
9e16bfc366 playGlobalMessage are receive as adminRoomMessage 
Suppression of GlobalMessageManager and TypeMessage
Migrating message to svelte
 2021-07-22 16:14:27 +02:00
_Bastler
b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier
9b2914cc63
Merge pull request #1239 from thecodingmachine/scripting_api_room_metadata 
Allowing loading/saving "metadata" from a room
 2021-07-22 11:28:12 +02:00
David Négrier
31811ab906 Improve docblock 2021-07-22 11:24:30 +02:00
David Négrier
ae5617f3a0 Simplifying promises 2021-07-22 10:41:45 +02:00
Lurkars
285f1ebe89 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-07-21 19:26:29 +02:00
_Bastler
39561b315c Twemoji Picker 2021-07-21 18:54:43 +02:00
_Bastler
3ccc471d2f Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-21 18:53:05 +02:00
David Négrier
080d495044 Renaming WA.room.getMap to WA.room.getTiledMap 2021-07-21 16:40:53 +02:00
Valdo Romao
cd49fd5b83 Fixe openPopup deprecated annotation 2021-07-21 16:10:30 +02:00
David Négrier
f435cecfdc Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-21 15:37:53 +02:00
Lurkars
7285122fed fix port 2021-07-21 12:00:15 +02:00
Lurkars
9d518eded8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-07-21 11:56:36 +02:00
Lurkars
d43202d90d fix userInput 2021-07-21 10:17:46 +02:00
Lurkars
f43deff626 use emote button 2021-07-21 09:41:22 +02:00
_Bastler
28583ad9c0 update chat 2021-07-20 21:17:54 +02:00
_Bastler
c9b3835f99 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-20 20:31:01 +02:00
David Négrier
2d55f982d3 Removing the 'search' parameters from the room URL sent to pusher 2021-07-20 18:29:41 +02:00
grégoire parant
b336e3b08a
Delete logo TCM on Error scene (#1297) 2021-07-20 16:45:24 +02:00
Lurkars
83bd19c8dc Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-07-20 16:27:49 +02:00
GRL
6e65952d75 SendGlobalMessage by sendAminMessage 2021-07-20 15:16:51 +02:00
GRL78
936f5d0301
Icon chat not italic or bold (#1296) 2021-07-20 10:28:40 +02:00
_Bastler
a503866311 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-19 18:56:01 +02:00
David Négrier
ac3d1240ae Setting a variable to undefined now removes it from server-side storage. 2021-07-19 18:46:33 +02:00
GRL78
697f316780
In SelectCharacterScene, if custom character not loaded then select the first character (#1284) 2021-07-19 17:06:36 +02:00
GRL78
9432c82386
Change address mail to contact us (#1282) 2021-07-19 17:05:23 +02:00
David Négrier
dbd5b80636 Adding support for "readableBy" and "writableBy" in back 
This means that we are now loading maps from server side.
 2021-07-19 10:16:43 +02:00
GRL
0d3c697add Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-19 10:01:13 +02:00
GRL
71bf6b362b Rework graphic of global message console 2021-07-19 09:38:49 +02:00
GRL
214226a271 Rework graphic of global message console 2021-07-19 09:22:47 +02:00
_Bastler
1054f6e0fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 18:11:06 +02:00
Kharhamel
d8176c2f8d
Merge pull request #1291 from thecodingmachine/chatTweak 
FEATURE: chat tweak
 2021-07-16 15:49:36 +02:00
kharhamel
f840034d9c FEATURE: chat tweak 2021-07-16 14:25:59 +02:00
David Négrier
3d76f76d3e Fixing merge 2021-07-16 11:37:44 +02:00
David Négrier
5c7ea7b258 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-16 11:22:36 +02:00
_Bastler
bcfdcafa81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 11:11:06 +02:00
_Bastler
c390615dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 08:33:40 +02:00
David Négrier
d0d191fc28 Removing useless ternary 2021-07-15 17:12:54 +02:00
David Négrier
f217fc8aad Removing dead code 2021-07-15 17:11:48 +02:00
David Négrier
c9fa9b9a92 Migrating away from the notion of public/private URL in WorkAdventure Github repository 
The notion of public/private repositories (with /_/ and /@/ URLs) is specific to the SAAS version of WorkAdventure.
It would be better to avoid leaking the organization/world/room structure of the private SAAS URLs inside the WorkAdventure Github project.

Rather than sending http://admin_host/api/map?organizationSlug=...&worldSlug=...&roomSlug=...., we are now sending /api/map&playUri=...
where playUri is the full URL of the current game.
This allows the backend to act as a complete router.
The front (and the pusher) will be able to completely ignore the specifics of URL building (with /@/ and /_/ URLs, etc...)
Those details will live only in the admin server, which is way cleaner (and way more powerful).
 2021-07-15 17:07:47 +02:00
kharhamel
285079cae2 FIX: VideoPeer destroy could be called twice 2021-07-15 16:31:43 +02:00
kharhamel
18a65651f3 FIX: media box should always have a height 2021-07-15 16:08:37 +02:00
GRL
e43ea3aa5e Graphic upgrade of the global message console 
Fix: error if LoginScene doesn't exist
 2021-07-15 15:09:35 +02:00
_Bastler
b9e8c970f2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-14 19:36:16 +02:00
Kharhamel
5f43aeba85
Merge pull request #1283 from thecodingmachine/fixVisitChatInteraction 
FIX: visit card is now an absolute position
 2021-07-13 17:20:29 +02:00
Kharhamel
091f3aa7ee
Merge pull request #1202 from thecodingmachine/betterNotifications 
improved the notifications
 2021-07-13 17:19:12 +02:00
kharhamel
e96cb6930b FIX: visit card is now an absolute position 2021-07-13 17:14:40 +02:00
kharhamel
3983d0c5bc FEATURE: improved the notification system 2021-07-13 16:54:11 +02:00
_Bastler
3e60042164 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:38 +02:00
_Bastler
304c3e8906 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:34 +02:00
GRL78
b2ea368097
Migrate getCurrentUser() to WA.player (#1279) 2021-07-13 15:13:14 +02:00
kharhamel
1ce801cced temp 2021-07-13 14:40:35 +02:00
kharhamel
50f3af81e4 temp 2021-07-13 14:40:35 +02:00
kharhamel
fecbc8a018 WIP: svelte menu 2021-07-13 14:40:35 +02:00
Kharhamel
41a1f56bd5
Merge pull request #1111 from thecodingmachine/svelteChat 
FEATURE: migrated the chat window to svelte
 2021-07-13 11:25:38 +02:00
GRL
01bfbc36b5 Merge branch 'svelteChat' of github.com:thecodingmachine/workadventure into svelteChat 2021-07-13 11:09:32 +02:00
GRL
f7127bfb5a Graphic upgrade 2 2021-07-13 11:05:34 +02:00
GRL
a093298993 Graphic upgrade 2 2021-07-13 11:00:32 +02:00
GRL
e2e94c11ff Autoscroll 2021-07-12 15:00:28 +02:00
grégoire parant
022d1fec63
ServiceWorker (#1243) 
- Create service worker to have PWA
 - Add install service worker
 - Add fecth service worker with a persistent cache navigator
 - Add favicon 512x512
 2021-07-12 13:17:45 +02:00
GRL
b9a2433283 Upgrade graphic of the chat 2021-07-12 11:59:05 +02:00
David Négrier
52fd9067b8 Editing do to add "state" API doc 2021-07-08 11:46:30 +02:00
_Bastler
bcab6ae1f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-08 08:20:42 +02:00
David Négrier
b1cb12861f Migrating variables functions to the "state" namespace. 2021-07-07 22:14:59 +02:00
kharhamel
3cfbcc6b02 FEATURE: migrated the chat window to svelte 2021-07-07 18:07:58 +02:00
David Négrier
e65e8b2097 First version with variables that actually work 2021-07-07 17:17:28 +02:00
David Négrier
ae9af56661
Merge pull request #1264 from thecodingmachine/UpdateShowHideLayer 
Show/Hide Layer now unset collision and can show/hide all the layer in a group layer
 2021-07-07 17:15:41 +02:00
GRL
64c569c42f Add documentation and CHANGELOG 
Modify error message
 2021-07-07 17:06:23 +02:00
GRL
41c60579a6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateSetTiles 2021-07-07 17:00:10 +02:00
GRL
e50292a2ba Add documentation 
No second parameter
 2021-07-07 16:58:54 +02:00
David Négrier
0a1c01fb26
Merge pull request #1266 from thecodingmachine/UpdateSetPropertyLayer 
SetProperty delete a property where tha value is undefined and load the map of exitUrl property
 2021-07-07 16:44:32 +02:00
grégoire parant
17525e1e15
Return at the new line into the Pop-up (#1267) 
Add regex to replace "\r\n" or "\r" or "\n" by <br/>
 2021-07-07 16:42:26 +02:00
GRL
6f6ad949ca Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateShowHideLayer 2021-07-07 16:34:36 +02:00
GRL
24811e0a31 SetProperty delete a property where tha value is undefined and load the map of exitUrl property 2021-07-07 14:59:40 +02:00
GRL
bef5e139c0 SetTiles can now set a tile to null so that there is no more tile. 2021-07-07 14:42:17 +02:00
GRL
d51ac45079 Show/Hide Layer now unset collision and can show/hide all the layer in a group layer 2021-07-07 14:26:53 +02:00
_Bastler
303aef3e68 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-07 12:20:28 +02:00
David Négrier
5116b82e77 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-07 11:55:00 +02:00
David Négrier
34cb0ebf39 Users blocking now rely on UUID rather than ID 
This way, if a user A blocks another user B, if user B refreshes the browser or leaves and re-enters the room, user B will still be blocked.
As a side effect, this allows us to completely remove the "sockets" property in the SocketManager on the Pusher.
 2021-07-07 11:24:51 +02:00
David Négrier
19bd1045e1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-06 17:24:16 +02:00
David Négrier
46e6917df6 Adding a playersStore 
The playerStore can be useful to get the details of a given player from its ID.
 2021-07-06 17:13:08 +02:00
David Négrier
cb78ff333b Adding client side check of setVariable with writableBy property 2021-07-06 10:58:12 +02:00
David Négrier
86fa869b20 Actually using Type Guards in queries received by WA. 2021-07-06 10:26:44 +02:00
David Négrier
0aa93543bc Adding warning if "template" object is used as a variable 2021-07-05 18:48:26 +02:00
David Négrier
bf17ad4567 Switching setVariable to a query and fixing error hangling in query mechanism 2021-07-05 18:29:34 +02:00
David Négrier
c30de8c6db Adding support for default variables values 2021-07-05 17:25:23 +02:00
jonny
4ea6a12d20 cast callback 2021-07-05 16:26:29 +02:00
David Négrier
abd53b6251 Adding WA.onInit method to wait for API startup. 2021-07-05 14:41:10 +02:00
David Négrier
62a4814961 Migrating WA.player.getCurrentUser and WA.room.getCurrentRoom to direct property access and WA.room.getMap 2021-07-05 11:53:33 +02:00
_Bastler
7932b7488f update emotes 2021-07-03 11:15:18 +02:00
_Bastler
74823177f5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-02 20:59:39 +02:00
jonny
9bcdc9ba33 linter fixes 2021-07-02 19:05:03 +02:00
jonny
310e131a6e eslint restart 2021-07-02 19:03:34 +02:00
jonny
369d453455 Merge remote-tracking branch 'remotes/upstream/develop' into trigger-message-refv3 2021-07-02 18:49:22 +02:00
David Négrier
ea1460abaf Adding variables (on the front side for now) 2021-07-02 17:36:43 +02:00
David Négrier
280c59e6b5 Changing callback signature of registerAnswerer so that it can return a value and not necessarily a promise. 2021-07-02 17:26:28 +02:00
David Négrier
5b4a72ea1f Add new "query/answer" utility functions for the scripting API 
So far, the scripting API was using events to communicate between WA and the iFrame.
But often, the scripting API might actually want to "ask" WA a question and wait for an answer.

We dealt with this by using 2 unrelated events (in a mostly painful way).

This commit adds a "queryWorkadventure" utility function in the iFrame API that allows us
to send a query, and to wait for an answer. The query and answer events have a unique ID to be
sure the answer matches the correct query.

On the WA side, a new `IframeListener.registerAnswerer` method can be used to register a possible answer.
 2021-07-02 16:49:22 +02:00
GRL
8644389d7e remove unnecessary conversion type 2021-07-02 14:45:27 +02:00
GRL
c5b5326480 setProperty function doesn't set an empty array if property doesn't exist 2021-07-02 14:40:18 +02:00
GRL
e1611969ce Merge branch 'develop' of github.com:thecodingmachine/workadventure into jonnytest1-tiles-start-positions 2021-07-02 14:35:28 +02:00
_Bastler
413f1ea6df fix 2021-07-01 13:48:03 +02:00
_Bastler
2701d656da Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-01 12:10:53 +02:00
_Bastler
72a07467c5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-01 12:10:26 +02:00
GRL
01d02124d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-07-01 11:38:33 +02:00
David Négrier
bfcdd31ed2 Fixing NPM package generation 
The generation was broken due to the refactoring in several classes (some of them where not properly exported).
Also, trying to generate the NPM package on every build now (to detect issues).
 2021-06-30 10:15:55 +02:00
_Bastler
ee1e4c1910 merge dev 2021-06-29 20:21:00 +02:00
David Négrier
8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
GRL
95bd639124 More statement 2021-06-29 16:50:33 +02:00
GRL
6462773e7f Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-29 14:16:19 +02:00
_Bastler
086243b92f twemoji emote menu 2021-06-29 09:52:13 +02:00
GRL
b457ce493b Suppress console.log 2021-06-29 09:44:57 +02:00
GRL
dad8cdef8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI 2021-06-29 09:42:20 +02:00
_Bastler
e1fd474420 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-29 09:40:33 +02:00
Lurkars
445449d2db remove port change for sync 2021-06-29 08:40:24 +02:00
Lurkars
81f2c8b746 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu 2021-06-29 08:37:08 +02:00
Lurkars
c264364752 Twemoji Emote Menu 2021-06-29 08:37:01 +02:00
_Bastler
44791d113d Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-29 07:52:33 +02:00
Valdo Romao
723001e1e7 Added better favicon 2021-06-29 00:12:00 +01:00
GRL
389ca25b6a Cowebsite opened by script can use Iframe Api 2021-06-28 18:00:48 +02:00
Valdo Romao
4cf5a6f7a0 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon 2021-06-28 15:56:28 +01:00
David Négrier
3fd4f9d384 Adding a warning message if an unauthorized iFrame tries to communicate with WA 
Closes #1241
 2021-06-28 15:20:27 +02:00
_Bastler
f13282f424 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-28 15:02:24 +02:00
David Négrier
1e57028e6e Renaming changeTile to setTiles 2021-06-28 14:58:49 +02:00
David Négrier
319db95bc8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 
# Conflicts:
#	front/src/Api/iframe/room.ts
 2021-06-28 14:50:26 +02:00
David Négrier
0c5774a48f
Merge pull request #1229 from jonnytest1/cache-fix 
immutableData was never assigned
 2021-06-28 14:18:45 +02:00
GRL
ed84dacb9c Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-28 12:01:08 +02:00
GRL
b182a08ca2 correction from review 2021-06-28 09:33:13 +02:00
jonny
b0eb241fc3 oO something kept movin the comment to the next line 2021-06-25 18:45:15 +02:00
jonny
bbdf0a1289 fixed merge conflict 2021-06-25 18:20:16 +02:00
jonny
7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions 2021-06-25 18:14:40 +02:00
jonny
769e0fcc29 refactor to position object 2021-06-25 18:03:43 +02:00
jonny
c7fa5cab8b cleanup 2021-06-25 17:57:09 +02:00
jonny
f536d538ea added backwards compatible check and maps 2021-06-25 17:35:42 +02:00
_Bastler
c29ada18e9 formatting 2021-06-25 16:32:48 +02:00
Lurkars
7d12d8561a Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-06-25 16:13:26 +02:00
_Bastler
07b6fce877 re-adding popup-input, video container fix 2021-06-25 11:34:27 +02:00
Lurkars
4c8ee41cf2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 18:28:12 +02:00
_Bastler
0bb39a6a5d Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 18:28:04 +02:00
David Négrier
ac97cf5772 Fixing a lock when the player is moving from one room to the other 
This was due to a store not properly unsubscribed when changing rooms.
 2021-06-24 17:02:57 +02:00
Lurkars
d28f0bed50 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 15:43:06 +02:00
_Bastler
3cb877cee0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 15:42:47 +02:00
David Négrier
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides 
Fix collides
 2021-06-24 15:19:10 +02:00
Lurkars
116c56be81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 13:04:28 +02:00
_Bastler
f4d2897957 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 13:02:41 +02:00
kharhamel
a094e16c1f FIX: solved a menu crash 2021-06-24 12:14:28 +02:00
GRL
dcc7f2a686 Fix collides 2021-06-24 12:10:44 +02:00
GRL
c79603d7fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-24 11:55:07 +02:00
David Négrier
2f282e3469 peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files) 2021-06-24 11:54:09 +02:00
GRL
4903911d62 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-24 11:33:29 +02:00
GRL
a666bf310b Change Tiles 2021-06-24 11:31:29 +02:00
David Négrier
e4708149e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay 
# Conflicts:
#	front/package.json
#	front/src/Components/App.svelte
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Menu/MenuScene.ts
#	front/src/WebRtc/MediaManager.ts
 2021-06-24 10:49:55 +02:00
David Négrier
8d59680de5 Removing useless code 2021-06-24 10:36:47 +02:00
David Négrier
5ed61012f0 Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed" 2021-06-24 10:34:36 +02:00
_Bastler
ab20a074fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 09:47:16 +02:00
Lurkars
a0418ddb78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-24 09:19:55 +02:00
_Bastler
418dd4a6c5 merge dev 2021-06-24 08:56:29 +02:00
jonny
d1178b1a01 immutableData was never assigned 2021-06-23 20:19:38 +02:00
jonny
5472d220ba added trigger message code 2021-06-23 17:32:32 +02:00
David Négrier
0828dd8af3 Making max line length to 120 2021-06-23 16:58:57 +02:00
David Négrier
3f0ef2d31a Fixing prettier run command 2021-06-23 16:56:33 +02:00
David Négrier
f6d3783f6c Removing git add from lint-staged since it is not necessary since v10 2021-06-23 16:50:00 +02:00
David Négrier
ecbadda65a
Merge pull request #1224 from thecodingmachine/prettier 
Setting up prettier
 2021-06-23 16:34:21 +02:00
David Négrier
9f9cf5a3bb Fixing .gitignore files 2021-06-23 16:30:42 +02:00
David Négrier
4cac260f81 Adding prettier on back and pusher (not running them right now) 2021-06-23 16:23:16 +02:00
David Négrier
c0bfec7b11 Adding Prettier configuration 2021-06-23 15:51:31 +02:00
jonny
54d392be82 fixed not returnin null if parsed from url 2021-06-23 15:06:38 +02:00
GRL
95d8cf9257 Change requested 2021-06-23 14:54:06 +02:00
jonny
64847cd465 adjusted null if no hash 2021-06-23 12:42:24 +02:00
jonny
b20b4abb9e allow start hashes in tiles 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-06-23 12:37:50 +02:00
GRL
24cc340cb9 Merge branch 'metadataScriptingApi' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 2021-06-23 12:02:29 +02:00
GRL
2a2cea2cd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-23 11:40:08 +02:00
GRL
bdb32a29e1 New methods refactored 2021-06-23 11:32:11 +02:00
David Négrier
b7934d9d03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into functional-tile-properties 2021-06-23 10:40:59 +02:00
David Négrier
bdc4b43c17 Setting up prettier 
In order not to wreak havoc on all the open PRs, Prettier will be added slowly,
on every changed file, thanks to Husky (for a precommit hook) and lint-staged, for linting only staged files.
 2021-06-23 10:10:53 +02:00
GRL
b50df10a49 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-23 09:25:13 +02:00
GRL
85fe92f604 Merge branch 'menu-commands-apiref' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-06-23 09:18:20 +02:00
David Négrier
ee07f637fa
Merge pull request #1219 from thecodingmachine/rex_outline 
Putting an outline on the character name
 2021-06-22 18:14:27 +02:00
David Négrier
1ef1a1cb22 Removing useless import 2021-06-22 17:47:54 +02:00
David Négrier
f1d00aac0e
Merge pull request #1211 from thecodingmachine/adminSvelte 
Migrating ConsoleGlobalMessageManager in svelte
 2021-06-22 17:28:37 +02:00
David Négrier
dc0f3feabf Putting an outline on the character name 
In the future, we might want to put an outline on the whole character body but this is harder as the body is actually a container and so we would need to turn this container into a sprite first.
 2021-06-22 17:15:18 +02:00
David Négrier
e9dd7ebdd9 Enabling Outline back on actionable objects 
Actionable objects (still a prototype) were outlined when you walk next to them.
The OutlinePipeline was broken when moving in Phaser 3.50+.

This PR completely removes the custom OutlinePipeline and replaces it with the rexOutlinePipelinePlugin
that is provided by a third party library and that works great \o/
 2021-06-22 16:35:57 +02:00
GRL
cec7087fc2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 16:28:45 +02:00
GRL
67d4c6e271 Resolve review 2021-06-22 16:12:53 +02:00
GRL
0728d462a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 16:08:06 +02:00
GRL
be23db5bcf Resolve import and LoadPageEvent issue 2021-06-22 16:07:31 +02:00
David Négrier
bdbd19c3da
Merge pull request #1216 from thecodingmachine/feature/animated-tiles 
Add animated Tiles plugin
 2021-06-22 15:32:55 +02:00
_Bastler
f82b106dce Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-22 14:26:47 +02:00
David Négrier
eb526f5b67 Upgrading animatedtiles plugin to trigger an event when an animation occurs and setting the scene to dirty state 2021-06-22 14:21:15 +02:00
GRL
ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
GRL
55d99b24f4 Correction form review and checks 2021-06-22 10:43:20 +02:00
GRL
0cc7ed1647 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 10:36:16 +02:00
GRL
4fedc30301 Correction form review and checks 2021-06-22 10:27:54 +02:00
GRL
da5ae02a06 Correction form review and checks 2021-06-22 10:22:49 +02:00
David Négrier
1283e86ce8 Adding test map for animated tiles 2021-06-22 10:22:48 +02:00
GRL
8a1c57c434 Correction form review and checks 2021-06-22 10:10:03 +02:00
GRL
267a0bbe4d Correction form review and checks 2021-06-22 09:49:04 +02:00
GRL
5cac4f52bc Correction form review and checks 2021-06-22 09:43:41 +02:00
jonny
8be29062f6 reverted import sorting 2021-06-21 18:41:41 +02:00
jonny
64a00481f0 fixed wrong import 2021-06-21 18:39:02 +02:00
jonny
ba1bcf226a menu command api 2021-06-21 18:22:31 +02:00
kharhamel
42c0d1002f FIX: no more whitespaces in player names 2021-06-21 17:58:04 +02:00
David Négrier
e4dab5fd0d Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/animated-tiles 
# Conflicts:
#	front/package.json
#	front/tsconfig.json
#	front/yarn.lock
 2021-06-21 17:26:00 +02:00
GRL
232fd33ec8 Migrating ConsoleGlobalMessageManager in svelte 2021-06-21 17:19:27 +02:00
David Négrier
b59cbcac4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay 
# Conflicts:
#	front/package.json
 2021-06-21 14:54:32 +02:00
David Négrier
cddade059f Removing commented code 2021-06-21 14:49:41 +02:00
David Négrier
a08f6a33ac Improving naming 2021-06-21 14:43:10 +02:00
David Négrier
77a4d23301 Renaming biggestAvailableArray to biggestAvailableArea + removing duplicated code. 2021-06-21 14:07:03 +02:00
David Négrier
6101548d89 Fixing bug where only one chat listener can be added. 2021-06-21 13:47:07 +02:00
David Négrier
620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier
ce0a52c227 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor2 
# Conflicts:
#	front/package-lock.json
 2021-06-21 11:53:07 +02:00
David Négrier
9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +02:00
jonny
7716fe4b62 run templater on running start script 2021-06-20 19:26:35 +02:00
jonny
5bf943ce77 converted cache to constant lookup time 2021-06-20 19:14:04 +02:00
jonny
92485a02cf tileIndex setting got merged out 2021-06-19 15:46:32 +02:00
jonny
c1d9b2c9ed coverted property map to object 2021-06-19 15:41:58 +02:00
jonny
27ccdf165c fixed merge imports 2021-06-19 15:24:27 +02:00
jonny
74dda8ab69 allow properties on tiles 
# Conflicts:
#	front/src/Phaser/Game/GameMap.ts
#	front/src/Phaser/Map/ITiledMap.ts
 2021-06-19 15:23:30 +02:00
David Négrier
34dc5a0bc6 Refactoring WorkAdventureAPI. 
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
 2021-06-18 17:22:56 +02:00
jonny
0690f088b6 setup to also run on windows 2021-06-18 00:21:54 +02:00
David Négrier
227575043b Removing dead code 2021-06-17 18:56:30 +02:00
David Négrier
4ec92ddf58 Adding new icons for the change layout button 2021-06-17 18:30:08 +02:00
jonny
702f4fe4c0 converted goToRoom to typed call 2021-06-17 11:32:59 +02:00
jonny
318749e5a8 develop merge 2021-06-17 11:30:16 +02:00
David Négrier
f6554a1082 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor 
# Conflicts:
#	front/src/iframe_api.ts
 2021-06-17 11:23:56 +02:00
David Négrier
d6ec0d22d3 Code cleanup 2021-06-17 10:35:08 +02:00
David Négrier
d533894a74 Fixing warnings and moving biggest area compute in store 2021-06-17 10:13:23 +02:00
David Négrier
d3544e2d97 Ignoring "no tracks" warning (cause really, we cannot add tracks to live streams) 2021-06-17 10:07:27 +02:00
David Négrier
d888b694cc Adding button to change layout 2021-06-17 10:07:27 +02:00
David Négrier
3b278d0498 Removing dead code 2021-06-17 10:07:27 +02:00
David Négrier
76261de805 Enabling back the open report feature 2021-06-17 10:07:27 +02:00
David Négrier
ca56a78814 Limiting the max height of video elements 2021-06-17 10:07:27 +02:00
David Négrier
5cf5e0ce2b Changing the way we focus a video element. 
Now, only one video element can be important.
 2021-06-17 10:07:27 +02:00
David Négrier
ac7fa164b6 Adding importance handling 2021-06-17 10:07:27 +02:00
David Négrier
e7b0f859a5 Migrating the video overlay in Svelte (WIP) 2021-06-17 10:07:27 +02:00
_Bastler
b96ba7f8c5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-16 19:58:34 +02:00
David Négrier
e6264948b1
Merge pull request #946 from jonnytest1/load-page-api 
Load page iframe-api
 2021-06-16 18:10:10 +02:00
jonny
c1e202b7b1 renamed to goToRoom 2021-06-16 17:16:00 +02:00
_Bastler
59ab1cdbae remove focus (unneccesary) 2021-06-16 12:06:23 +02:00
_Bastler
a3bed1eeb4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-16 11:38:43 +02:00
David Négrier
0afdbf7040 Fixing Svelte-check errors 2021-06-15 18:34:11 +02:00
David Négrier
085a4d41fd Adding svelte-check to the build process 
Type checking in Svelte was not enabled (because we were not running svelte-check).
This PR adds:

- run svelte-check in watch mode in development
- run svelte-check in CI
 2021-06-15 18:08:16 +02:00
kharhamel
c559b2104b scene cleanup 2021-06-15 15:32:40 +02:00
_Bastler
b3c58bd5d4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 15:24:00 +02:00
jonny
7712bd685b fixed merge errors 2021-06-15 15:19:45 +02:00
jonny
238f333b81 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
 2021-06-15 15:05:49 +02:00
Kharhamel
407f46f248
Merge pull request #1187 from thecodingmachine/touchIframeResize 
FIX: fixed the cowebsite aside dom not being visible on some browser
 2021-06-15 14:40:26 +02:00
kharhamel
40e2ba196d FIX: fixed the cowebsite aside dom not being visible on some browser 2021-06-15 14:35:29 +02:00
David Négrier
eb895ceb58
Merge pull request #1178 from thecodingmachine/touchIframeResize 
FIX: cowebsite resize now works on touchscreens
 2021-06-15 11:42:41 +02:00
GRL
09da69c24a CustomizeScene buttons use moveHorizontally and moveVertically 2021-06-15 11:16:44 +02:00
kharhamel
a5779095f8 FIX: cowebsite resize now works on touchscreens 2021-06-15 10:55:18 +02:00
_Bastler
29da03ee44 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 09:21:40 +02:00
GRL
b04016f30f Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix 2021-06-15 09:06:47 +02:00
_Bastler
39dbd56207 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 08:18:39 +02:00
David Négrier
6bca3469b6 Removing useless import 2021-06-14 18:44:20 +02:00
David Négrier
1fa03e44df Fixing size of camera on resize 
The size of the Camera after a change in zoom is only computed on the "render" step.
Therefore, we should wait the "render" step to call GameScene.onResize.

Closes #1180
 2021-06-14 18:40:58 +02:00
David Négrier
6af9b5d0fc Disable screensharing button if user refuses rights 
If the user refuses the popup to screen-share, we should switch back the button to gray.

Closes #1179
 2021-06-14 18:18:57 +02:00
David Négrier
f16514db21
Merge pull request #1177 from thecodingmachine/bugfix/1167 
Making code more robust regarding scene being null in Character class
 2021-06-14 16:54:12 +02:00
David Négrier
dcd44f283f Making code more robust regarding scene being null in Character class 
Not sure how this can happen but it does.
Closes #1167
 2021-06-14 16:40:33 +02:00
David Négrier
e3ee66527a Fixing bug slowing down the CustomizeScene a lot 
By forcing the containers to be updated only in the "update" method, we seem to be solving some bugs regarding the way sprites are handled.
There is still an issue though. Some times, for some reasons, the update list seems to be growing a lot.
The more we click the left/right arrow to choose a character, the slower it gets (but with this commit, it does not lock anymore)
 2021-06-14 16:32:09 +02:00
GRL
b239edb266 Clean code 2021-06-14 16:09:41 +02:00
GRL
c2fba35360 Suppression blue back-ground 2021-06-14 16:04:55 +02:00
GRL
281b8580cd Use window and not viewport in css for main-container 2021-06-14 15:54:22 +02:00
GRL
f103a919f2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix 2021-06-14 14:25:59 +02:00
kharhamel
4d467e9f86 FIX: Improved the visuals of the visit card 2021-06-10 16:57:33 +02:00
GRL
d26502a724 Use HtmlUtils to get DOM Element game 2021-06-10 09:23:25 +02:00
grégoire parant
5a2b3a303a
Improve texture loaded from admin (#1151) 2021-06-09 22:33:42 +02:00
GRL
6868128267 DOM Element game resize at the same time and the same size at the canvas of phaser 
Remove VisitCard scss unused
 2021-06-09 18:08:14 +02:00
GRL
61180a6e64 The cam of other people in a bubble is at the top of the screen even when a iframe is open on mobile 2021-06-09 15:29:37 +02:00
David Négrier
07e6438902
Merge pull request #1145 from thecodingmachine/dimensionMobile 
Mobile sizing problem
 2021-06-08 18:21:05 +02:00
GRL
f6b3b9cfd4 Update facebook link 2021-06-08 18:05:03 +02:00
_Bastler
672a94be04 change avatar label 2021-06-08 16:51:08 +02:00
David Négrier
bcc86d6041
Merge pull request #1144 from thecodingmachine/betterVisitCard 
FIX: improved the visit card, cleanup the code
 2021-06-08 16:47:13 +02:00
_Bastler
7a10f4ecb6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-08 16:46:32 +02:00
kharhamel
dd45996f9c FIX: improved the visit card, cleanup the code 2021-06-08 16:39:22 +02:00
GRL
4c1dd914eb DOM element game 1OO% height 2021-06-08 16:32:21 +02:00
David Négrier
5c9da4a725
Merge pull request #1139 from thecodingmachine/fix-webcam-name 
Fixing the cleaning of webcam name
 2021-06-08 14:35:13 +02:00
David Négrier
01c128e413
Merge pull request #1088 from thecodingmachine/dependabot/npm_and_yarn/front/dns-packet-1.3.4 
Bump dns-packet from 1.3.1 to 1.3.4 in /front
 2021-06-08 14:05:02 +02:00
David Négrier
fab5c17dc2 Fixing the cleaning of webcam name 
Closes #1130
 2021-06-08 12:19:07 +02:00
David Négrier
1b89adc604
Merge pull request #1137 from thecodingmachine/fix_script_prod 
Fixing scripting origin check
 2021-06-08 10:29:55 +02:00
David Négrier
e3223164b6
Merge pull request #1117 from thecodingmachine/selectCharacterFix 
Fix : SelectCharacterScene and SelectCompanionScene
 2021-06-08 10:29:21 +02:00
David Négrier
0c38f3b55c
Merge pull request #1131 from thecodingmachine/safari-fix 
Fix broken layout on EnableCameraScene on mobile
 2021-06-08 10:28:38 +02:00
GRL
d615a7c6a5 suppression comments 2021-06-08 10:12:59 +02:00
GRL
7a3921947a dark mode on select 2021-06-08 10:10:33 +02:00
GRL
1cceed2fd6 dark mode on select 2021-06-08 09:52:52 +02:00
GRL
a7cf071971 max height on select on all device and screen 2021-06-08 09:10:06 +02:00
Kharhamel
e2295d2419
Merge pull request #1133 from thecodingmachine/disableVisitCard 
FIX: the visit card feature can now be disabled client side
 2021-06-07 19:12:37 +02:00
GRL
aa9c3b9f4f max height on select 2021-06-07 17:18:39 +02:00
David Négrier
b03ee5bd53 Fixing scripting origin check 
When working on making the openCoWebsite URL relative, we introduced a regression.
In production, the iframe generated by "script" properties have no "src" and therefore, were treated as invalid messages.

This should fix everything in prod.
 2021-06-07 16:48:52 +02:00
GRL
c9da38c7ec reduce select field 2021-06-07 16:23:00 +02:00
GRL
000be7aa49 console 2021-06-07 16:12:31 +02:00
kharhamel
1264b286b2 FIX: trying to start a emote after a scene is desotryed should not crash the game 2021-06-07 15:11:54 +02:00
kharhamel
26f21fe6e4 FIX: the visit card feature can now be disabled client side 2021-06-07 15:01:21 +02:00
GRL
88a72e0153 change width of select field 2021-06-07 15:00:01 +02:00
GRL
3e1f10491a font-size reduce by 20% 
img width = 1vw
 2021-06-07 14:40:38 +02:00
GRL
dd0391687f change font-size 
Change width and margin of img on mobile
 2021-06-07 14:19:50 +02:00
David Négrier
311c74584c Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-06-07 10:42:27 +02:00
David Négrier
ac911cff4b Properly escaping name in discussion manager 2021-06-07 10:42:08 +02:00
GRL
cbf786fd56 Remove img and margin 2021-06-07 10:29:38 +02:00
GRL
e45198e403 Remove marging bottom of SelectWebcamForm 2021-06-07 10:09:51 +02:00
GRL
23c74bd7aa Create a PR to fix broken layout on EnableCameraScene on mobile 2021-06-07 09:27:49 +02:00
GRL
edfdc3bf47 comment on pointerTimer and pointerClicked 2021-06-07 09:17:24 +02:00
_Bastler
d20ca2f15b Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-04 21:08:43 +02:00
Kharhamel
d464f94e0f
Merge pull request #1127 from thecodingmachine/fixMobileVisitCard 
FIX: temporary fix for visit card on mobile
 2021-06-04 19:40:28 +02:00
kharhamel
8afa94aae3 FIX: temporary fix for visit card on mobile 2021-06-04 19:36:30 +02:00
GRL
3e19234edc Change <dialog> for ErrorDialog in <div> because only Chrome knows <dialog> 2021-06-04 16:32:21 +02:00
David Négrier
bacd260547 Prevents error message from being displayed twice in the same dialog 2021-06-04 16:22:15 +02:00
David Négrier
9f09dc9df2 Adding a special error message for non Safari browsers on iOS < 14.3 2021-06-04 16:19:41 +02:00
David Négrier
469cac9656 Making sure the "stopped screensharing" log is not displayed on startup 2021-06-04 16:08:02 +02:00
David Négrier
01ce94585a Displaying only message in the Dialog error (and not the exception name in front of the message) 2021-06-04 16:07:36 +02:00
GRL
a58d6353cd Merge branch 'develop' of github.com:thecodingmachine/workadventure into iphoneCompatibility 2021-06-04 16:02:46 +02:00
David Négrier
fd4f09588e Adding "playsinline" tag in remote <video> tags for iPhone compatibility (test) 2021-06-04 14:16:21 +02:00
_Bastler
eee3956b60 merge latest dev + fix font 2021-06-04 11:14:49 +02:00
David Négrier
2905a5570c Removing commented code 2021-06-04 10:33:24 +02:00
David Négrier
f4ed527fe8 Adding a global error message 
This error message should be used for non fatal errors (otherwise, use the ErrorScene).
It is implemented using Svelte and the new "$errorStore".

Use `errorStore.addErrorMessage` to display the error popup with the message.

This PR uses this error message to display a popup explaining the browser is too old for WebRTC.
 2021-06-04 10:33:22 +02:00
David Négrier
a8b91561dc Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-06-04 10:07:57 +02:00
David Négrier
b7ac3b8fad Generating HTML link using DOM manipulation rather that string manipulation 2021-06-04 10:07:12 +02:00
GRL
247d508d09 create PR to test iphone compatibility 2021-06-04 10:01:08 +02:00
GRL
0d2b190222 Replace setTimeout by timer manage in Update 2021-06-04 09:39:33 +02:00
Lurkars
417feec56b Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-06-04 09:28:20 +02:00
_Bastler
f24a547814 merge dev 2021-06-04 08:53:45 +02:00
jonny
dab3f1f844 removed zoned popups 2021-06-03 22:01:42 +02:00
Gregoire Parant
e190c3b8d6 Merge branch 'master' into develop 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2021-06-03 20:15:50 +02:00
grégoire parant
eec15b38bb
Hot Fix open & close iframe (#1115) 2021-06-03 20:05:39 +02:00
kharhamel
c5f3cfe87c FEATURE: clicking on another player show a contact card when possible 2021-06-03 17:58:21 +02:00
grégoire parant
fffd36267d
Hot Custom Characters Scene (#1113) 2021-06-03 17:22:31 +02:00
GRL
02ff6fb5bf Add timer so that pointerdown event can't be call two time in one click 2021-06-03 17:08:56 +02:00
GRL
c435b7451e Update don't call createPlayer but call moveUser 
Change time of pointerclicked from 100ms to 250ms
Suppression of console.log
 2021-06-03 16:54:52 +02:00
David Négrier
46666d17dc Making sure the report audio sound does not break the application on iOS 2021-06-03 15:56:06 +02:00
David Négrier
50e994c674 Attempt to switch bubble sound playing into Phaser 
In iOS, we cannot trigger a playing sound if it does not start from a user gesture.
This is a huge bummer for a notification sound!

This is an attempt to switch sound playing to Phaser, which is using under the hood the WebAudio API.
This might solve the issue.
 2021-06-03 15:40:44 +02:00
David Négrier
80a698d891 Preventing crash on iOS 
On iOS, audio elements must be triggered by a user gesture.
We are catching exceptions thrown in order not to crash.

In the future, we need to find another way to play sounds.
 2021-06-03 14:53:58 +02:00
David Négrier
46cd387853
Merge pull request #1107 from thecodingmachine/enableCameraSceneSafari 
Fixing camera on safari iphone
 2021-06-03 14:42:18 +02:00
David Négrier
ebf217057d Switching to "playsinline" attribute in the video tag (both of them) 2021-06-03 14:31:21 +02:00
David Négrier
9401662f83
Merge pull request #1105 from thecodingmachine/dependabot/npm_and_yarn/front/ws-6.2.2 
Bump ws from 6.2.1 to 6.2.2 in /front
 2021-06-03 14:15:38 +02:00
grégoire parant
2b13b764b4
Public texture (#1093) 
* Public texture

 - Front => Get texture when user connected on public method
 - Front => Anonymous login will be make every connexion to get map details
 - Pusher => `/anonymLogin` permit to get map details and public texture load in customize scene

* Improve texture local user

- Permit to keep previous texture get with 'register' link

* Texture public loading

 - Texture will be load with Room class
 - Fix issue on lazzy loading atttempt

* Remove async await useless
 2021-06-03 13:07:52 +02:00
GRL
4fd453ec05 playsinline on video 2021-06-03 12:02:58 +02:00
David Négrier
9e42d9d05b
Merge pull request #1106 from thecodingmachine/safari_fix 
Fixing Safari on MacOS compatibility
 2021-06-03 10:50:30 +02:00
David Négrier
5f562f49c3 Improving error message 2021-06-03 10:49:12 +02:00
David Négrier
eb6cfdf53d Fixing missing early return if webcam not available 2021-06-03 10:39:30 +02:00
GRL
8bcfc3cbee Max height on EnableCameraScene 2021-06-03 10:30:53 +02:00
kharhamel
b8ffe5038c FIX: on a touch screen, the menu emote will not open if more than one pointer is used 2021-06-03 10:22:06 +02:00
David Négrier
25f4adc7ad Fixing Safari on MacOS compatibility 
The null safe operator is not recognized and was not encoded by Webpack in Svelte expressions (inside {})

+ The Notification API of Safari is old and broken and we need to account for that.
 2021-06-03 10:17:38 +02:00
dependabot[bot]
918a37173e
Bump ws from 6.2.1 to 6.2.2 in /front 
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-03 08:10:49 +00:00
GRL
304675bc74 Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 18:01:42 +02:00
GRL
59d60f54fe Save zoom level in the gameScene and restore it after the SelectCharacterScene and CustomizeScene 2021-06-02 18:01:36 +02:00
David Négrier
100198b55c Using "standardized-audio-context" to fix compatibility of AudioContext with Safari. 2021-06-02 17:58:58 +02:00
David Négrier
d43633e936 Added an animation when audio message played 2021-06-02 16:52:25 +02:00
David Négrier
f4880cc1d0 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 16:48:53 +02:00
David Négrier
267d0a2cd1 Moving audio message to Svelte 2021-06-02 16:46:28 +02:00
GRL
ba038dc75a Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 16:08:38 +02:00
GRL
3d9e2ad49a Save zoom level of the game and restore it when quitting the login scenes 
SelectCompanionScene with zoom on mobile
 2021-06-02 16:08:31 +02:00
David Négrier
faa4c7c08e Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 12:27:54 +02:00
David Négrier
395d66e648 Putting grey background under video 
Signed-off-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-06-02 12:27:46 +02:00
GRL
6fd119c199 Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 12:00:50 +02:00
GRL
5bd5245044 SelectCharacterScene and CustomCharacterScene mobile version 2021-06-02 12:00:35 +02:00
David Négrier
321fc3184a Fixing scrollability of enable camera scene page 2021-06-02 10:44:36 +02:00
David Négrier
950c5ace3f Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 10:14:42 +02:00
David Négrier
3f20d5b0d1 Trying to fix cam size in portrait and overflow 2021-06-02 10:14:33 +02:00
GRL
e9ec5f26aa Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 09:59:44 +02:00
GRL
ea576477cd Border on videocam in enable camera scene 2021-06-02 09:58:34 +02:00
David Négrier
9e35f96ce5 Fixing absolute/relative layouts of Svelte layers 2021-06-02 09:58:00 +02:00
David Négrier
96cd097af8 Fixing cam and controls position 2021-06-02 09:09:23 +02:00
David Négrier
2230f94410 Removed unused message warning 2021-06-01 17:59:00 +02:00
David Négrier
22dff82bd3 Adding back a transition on HelpCameraSettingsPopup 2021-06-01 17:23:16 +02:00
David Négrier
9c9699d2d1 Fixing absolute positioning of Svelte scenes 2021-06-01 17:07:56 +02:00
David Négrier
b04c438d6f Detect webcams unplugged 2021-06-01 16:43:24 +02:00
GRL
9aeb18df37 correction following review by Kharhamel 2 2021-06-01 16:36:13 +02:00
GRL
5735e9da36 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 16:31:09 +02:00
GRL
cd482ef1d2 correction following review by Kharhamel 2021-06-01 16:29:49 +02:00
David Négrier
cf9467419d Fixing scene overflow 2021-06-01 16:22:39 +02:00
David Négrier
d04df35506 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 16:17:45 +02:00
David Négrier
bf7083effc Migrating EnableCameraScene to Svelte 2021-06-01 16:17:36 +02:00
GRL
2d93be519f Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 11:52:55 +02:00
GRL
10e40930e2 Adding map test helpCameraSetting 2021-06-01 11:52:19 +02:00
David Négrier
c7b3e3cd44 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 11:19:56 +02:00
David Négrier
47555d5955 Migrating cam to Svelte on Camera setup screen 2021-06-01 11:19:46 +02:00
GRL
9a5300dd2d helpCameraSettingPopup in svelte with nes-css 2021-06-01 11:07:52 +02:00
David Négrier
5839e0b270 Throwing exceptions into store subscribers is wreaking havok 2021-06-01 09:17:01 +02:00
David Négrier
9063ba2a1f Removing call to removed method 2021-06-01 09:12:31 +02:00
David Négrier
59256f4cb9 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 09:09:11 +02:00
David Négrier
9d6b597552 Starting working towards migrating the help camera popup 2021-06-01 09:08:02 +02:00
GRL
ffcfb7495b Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 18:06:02 +02:00
GRL
1ed881e0bf arrow up black and white colors 2021-05-31 18:05:34 +02:00
David Négrier
ce645a83ab Fixing display of terms and conditions 2021-05-31 18:02:45 +02:00
GRL
f8cbf41c3a Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 17:54:07 +02:00
GRL
047337ae81 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 17:53:44 +02:00
David Négrier
11fb0aa1d8 Fixing typo 2021-05-31 17:53:27 +02:00
GRL
4923ce8b83 selectCharacterScene and customCharacterScene in svelte 2021-05-31 17:50:14 +02:00
David Négrier
cb03580421 Partial migration of EnableCameraScene to Svelte 2021-05-31 17:49:41 +02:00
David Négrier
13d3227323 Migrating LoginScene to Svelte 2021-05-31 17:03:29 +02:00
GRL
120a488121 Adding selectCompanionStore 2021-05-31 12:16:46 +02:00
GRL
b8873d1277 selectCompanionScene work with svelte 2021-05-31 12:06:11 +02:00
GRL
471ff2bb01 Merge branch 'develop' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 10:21:15 +02:00
GRL
1ac108a9b8 correction of resize select character and companion by David 2021-05-31 10:20:48 +02:00
_Bastler
e43fe7cebd fix action+add html 2021-05-30 20:00:41 +02:00
_Bastler
85c9393962 merged latest dev 2021-05-30 15:29:28 +02:00
David Négrier
90176da888 MediaManager cleanup 
- Removing the last reference to the local video stream. Everything is now fetched from the store.
- Remvoing commented code
 2021-05-29 22:34:38 +02:00
David Négrier
4077db37e3
Merge pull request #1091 from thecodingmachine/fixing_button_style 
Fixing buttons design
 2021-05-29 22:08:54 +02:00
David Négrier
588e5566d0 Fixing buttons design 
Fixing the color of camera/microphone/screen sharing buttons that was broken following the migration to Svelte
 2021-05-29 22:05:47 +02:00
David Négrier
b7f1461405 Removing listeners from MediaManager. 
SimplePeer now reacts only to stores.
 2021-05-29 22:04:08 +02:00
David Négrier
5295f923b5
Merge pull request #1086 from thecodingmachine/camera_controls_in_svelte 
Switching Camera controls in Svelte
 2021-05-28 18:16:51 +02:00
kharhamel
679b5b6b79 FIX: better error text in LoginScene 2021-05-28 17:51:18 +02:00
David Négrier
b3aa8975e9 Switching the video feedback in Svelte 2021-05-28 16:20:02 +02:00
_Bastler
de02580ac8 merge latest dev 2021-05-28 15:53:27 +02:00
_Bastler
76f35acc17 update 2021-05-28 15:46:25 +02:00
dependabot[bot]
ee3097e6b0
Bump dns-packet from 1.3.1 to 1.3.4 in /front 
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-28 13:41:07 +00:00
kharhamel
12da6ddd6c FEATURE: improved the display of player names, with the font-family 'Press start 2P' and gray outlines 2021-05-28 15:33:10 +02:00
_Bastler
ae67f43a7e add iro 2021-05-28 13:57:00 +02:00
jonny
ed39043bbe this should make one file only 2021-05-28 13:10:30 +02:00
GRL
276b404dd9 Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-28 12:13:25 +02:00
GRL
858a513569 correction of adding custom menu 
correction of setProperty
updating CHANGELOG
updating api-reference
 2021-05-28 12:13:10 +02:00
David Négrier
d1c22b122c Improving icons centering 2021-05-28 10:48:24 +02:00
David Négrier
cc1eab653a Fixing screen sharing button display 2021-05-28 10:48:13 +02:00
David Négrier
4b77e8c577 Switching Camera controls in Svelte 
Moving Camera controls out of HTML + MediaManager and into Svelte components
 2021-05-28 09:31:04 +02:00
jonny
8a1376e966 refactored to key based types 2021-05-28 02:28:11 +02:00
jonny
dbb35d102f extracted giant typing block 2021-05-28 01:59:43 +02:00
jonny
5fd82c1188 minor cleanup 2021-05-28 01:50:58 +02:00
jonny
ab631c5dc4 register callbacks 
should be done now
 2021-05-28 01:46:08 +02:00
jonny
9e6fb755d9 added javascript for setting commands 2021-05-28 01:44:38 +02:00
jonny
fd5b598b63 Bubble [WIP] (still need to do the javascript part) 2021-05-28 01:18:00 +02:00
jonny
540e5783b6 cowebsite 
navigation
sound
player
extraction
 2021-05-28 01:14:10 +02:00
jonny
ea04dd5303 Merge branch 'iframe-api-refactor' of github.com:jonnytest1/workadventure into iframe-api-refactor 2021-05-28 00:58:11 +02:00
jonny
6a90655c44 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into iframe-api-refactor 2021-05-28 00:52:42 +02:00
jonnytest1
b35207a578
Merge branch 'develop' into iframe-api-refactor 2021-05-28 00:38:12 +02:00
jonny
cbe93d7164 [WIP] fixed cherry pick conflicts 2021-05-28 00:34:40 +02:00
jonny
2de2d114a1 added typedef for subobject types 
extracted popup functions

# Conflicts:
#	front/package-lock.json
#	front/package.json
#	front/src/iframe_api.ts
 2021-05-28 00:30:51 +02:00
jonny
1a1ab30574 extraction idea 
# Conflicts:
#	front/src/Api/ScriptUtils.ts
#	front/src/iframe_api.ts
 2021-05-28 00:29:21 +02:00
David Négrier
5d8d729bd7 Uncommenting action 2021-05-27 18:25:27 +02:00
GRL
6dcb0d3750 first step to change tile 2021-05-27 17:06:39 +02:00
GRL
9cd3ff1d31 Merge branch 'correct-merge' into metadataScriptAPIV2 2021-05-27 10:16:00 +02:00
GRL
acbe4f89a6 Merge branch 'update-game-tiles' into correct-merge 2021-05-27 09:45:25 +02:00
_Bastler
05e18e0568 merge betterNameText 2021-05-26 20:31:33 +02:00
_Bastler
7bdbc191b5 merge latest dev 2021-05-26 19:14:18 +02:00
_Bastler
7e07279c88 character hotifxes 2021-05-26 18:46:25 +02:00
GRL
5565ddd3f4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 17:22:37 +02:00
David Négrier
870f16f9c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript 2021-05-26 16:15:33 +02:00
David Négrier
54e300443b Fixing Typing 2021-05-26 16:11:22 +02:00
David Négrier
fac6574cb5 Removing console.log and unused files 2021-05-26 16:08:43 +02:00
David Négrier
6d15921674 Fixing screen-sharing button not hidden anymore when hovering button 2021-05-26 12:30:56 +02:00
David Négrier
4f1cab5afe Fixing comments 2021-05-26 12:19:58 +02:00
David Négrier
4c4f310b79 The share screen button is now displayed only when screen sharing makes sense. 
Also, fixed the button not aligned bug
 2021-05-26 12:12:47 +02:00
David Négrier
dd428bc1e1 Migrating screen sharing to using a store 2021-05-26 12:12:47 +02:00
David Négrier
d32df13f1b Camera now show up when someone is moving and hides 5 seconds after we stop moving. 
Also, added an animation to show/hide the webcam.
 2021-05-26 12:12:46 +02:00
David Négrier
8af8ccd54b Migrating MediaManager game part to Svelte store 2021-05-26 12:12:18 +02:00
David Négrier
28d78a7988 Switching MediaManager to using a Svelte store 
This allows cleaner and more expressive code, especially regarding whether the webcam should be on or off.
 2021-05-26 12:11:16 +02:00
David Négrier
4f4d2532b7
Merge pull request #1082 from thecodingmachine/disabling_physics_optim 
Moving Physics optim to DirtyScene
 2021-05-26 12:08:57 +02:00
David Négrier
bc19cbd525 Moving Physics optim to DirtyScene 
The Physics engine is now disabled only if no sprites are moving (if they have no velocity).
Also, if a sprite is moving (if it has a velocity), the dirty state is set.
 2021-05-26 12:00:27 +02:00
GRL
17261dfab6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 10:58:25 +02:00
GRL
c8e2416e08 documentation of getCurrentUser, getCurrentRoom and on working with group layer 2021-05-26 10:41:33 +02:00
GRL
b4fa38bf8c Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-25 17:21:12 +02:00
GRL
a5cb93541a correction from code review 2021-05-25 17:21:02 +02:00
kharhamel
595c5ca64d now use custom emotes with tweens instead of transistions 2021-05-25 16:37:24 +02:00
GRL78
7c44d747de
Apply suggestions from code review 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-05-25 11:02:25 +02:00
GRL
d4bc999c54 pause loading tileset on fly 2021-05-25 10:15:56 +02:00
GRL
36f0cd1a23 Revert "pause for loading tileset on the fly" 
This reverts commit a3165a0540.
 2021-05-25 10:11:27 +02:00
GRL
343ad6ea96 Revert "preparation for merge with metadataScriptApi" 
This reverts commit b18b2fe0e3.
 2021-05-25 10:11:25 +02:00
GRL
a7b09e91ba Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" 
This reverts commit 428625e61b, reversing
changes made to a3165a0540.
 2021-05-25 10:09:58 +02:00
GRL
428625e61b Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-25 09:54:00 +02:00
GRL
b18b2fe0e3 preparation for merge with metadataScriptApi 2021-05-25 09:50:59 +02:00
GRL
a3165a0540 pause for loading tileset on the fly 2021-05-25 09:39:04 +02:00
GRL
d0aaa0620d Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-25 09:24:26 +02:00
DESKTOP-FMM8UI0\CLV
0c3b9ccfbf Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript 
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
#	maps/Tuto/scriptTuto.js
#	maps/Village/Village.json
 2021-05-21 17:45:26 +02:00
GRL
1110f4fb7f Revert "Merge branch 'update-game-tiles' into metadataScriptingApi" 
This reverts commit 796a9418d3, reversing
changes made to 3506063e65.
 2021-05-21 16:24:48 +02:00
GRL
796a9418d3 Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-21 15:56:35 +02:00
GRL
3506063e65 first step on loading a tileset from a script 2021-05-20 17:09:10 +02:00
GRL
2f9cc393a7 Implementation of getTag of the current user 
documentation of getTag
Adding map for test of getTag
 2021-05-20 10:57:36 +02:00
kharhamel
d93b30f982 improved radial menu 2021-05-19 18:11:51 +02:00
kharhamel
35b37a6a88 Added a radial menu to run emotes 2021-05-19 15:17:50 +02:00
kharhamel
a1d52b4265 FEATURE: added the possibility toplay emotes 2021-05-19 15:17:03 +02:00
GRL
ce0a72c6ce Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-19 09:36:11 +02:00
GRL
b509471140 documentation 
documentation of onPlayerMove
documentation of getMap
documentation of getGameState
 2021-05-18 17:05:16 +02:00
_Bastler
aa0e3d5190 fix html 2021-05-18 16:02:51 +02:00
Lurkars
451fa7dcd7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-18 15:57:40 +02:00
GRL
aa78bf44ef implementation of DataLayerEvent 
update GetGameState to add nickname to the returned data
update GameMap to separate phaserLayer and mapLayer
 2021-05-18 15:41:16 +02:00
_Bastler
f2d8035abe fix z-index 2021-05-18 15:29:23 +02:00
GRL
201fcf6afa Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-18 15:18:35 +02:00
_Bastler
5538a511c7 merge latest dev 2021-05-18 15:04:35 +02:00
GRL
2ee62c9e9e Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-18 11:50:03 +02:00
kharhamel
20ec609535 FIX: rejected map axios promises are now catched 2021-05-18 11:45:07 +02:00
GRL
3edfd5b285 GameState is now save in cache 
HasPlayerMoved is send when the player is actually moving on the map every 200ms.
 2021-05-18 11:33:16 +02:00
David Négrier
2ea731beeb
Merge pull request #1057 from thecodingmachine/physics_flag 
Making sure Physics is not enabled several times
 2021-05-18 10:26:32 +02:00
David Négrier
c9eb5691b5
Merge pull request #1045 from thecodingmachine/svelte 
Installing Svelte in front container
 2021-05-18 10:25:54 +02:00
David Négrier
127a4759ac Merge branch 'develop' of github.com:thecodingmachine/workadventure into menu-command-api 
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
 2021-05-18 10:16:44 +02:00
_Bastler
d133bf17ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-05-18 09:54:08 +02:00
David Négrier
9b68faac0e
Fixing JSDoc 2021-05-18 09:53:54 +02:00
David Négrier
6128f1e431 Making sure Physics is not enabled several times 
As part of an energy saving measure, we started disabling physics when the character is not moving and enabling physics again only when the character moves.
However, we enabled Physics on each frame the characeter was moving.
As a result, the Physics system would run several times, slowly slowing the computer down.

This fixes this issue by adding a flag to only enable Physics once.
 2021-05-18 09:42:01 +02:00
David Négrier
24dfa2703d Set a global dirty flag on resize 
This adds a global "Dirty" flag at the Game level and sets it each time the ScaleManager is modified.
This fixes a bug where the game was not redrawn when a CoWebsite was opening/closing.
 2021-05-18 09:20:38 +02:00
_Bastler
777987600f update 2021-05-18 07:58:47 +02:00
_Bastler
bfb6b118cd Merge remote-tracking branch 'origin/develop' into dev_main_merge 2021-05-17 17:18:08 +02:00
David Négrier
54e9e5656b Commenting menu display (for now) 2021-05-17 16:50:35 +02:00
David Négrier
00dd5a8c84 Fixing Yarn 2021-05-17 16:45:52 +02:00
David Négrier
7cc1e5b2c6 Moving styles out of the "dist/" directory 2021-05-17 16:41:40 +02:00
David Négrier
79935593e2 Adding fork-ts-checker-webpack-plugin 
This allows offloading type checking to another process and saves ~1-2 seconds for each build.
Also, we can integrate ESLint into the build pipeline and this is dope!
 2021-05-17 16:41:38 +02:00
David Négrier
6e7f8507b1 Removing custom stats 2021-05-17 16:41:10 +02:00
David Négrier
849e68ece2 Optimizing build time + inline small files into CSS 2021-05-17 16:41:10 +02:00
David Négrier
db40681be7 Code cleanup 2021-05-17 16:41:10 +02:00
David Négrier
9c4c6f2d53 Fixing Jasmine tests 2021-05-17 16:41:10 +02:00
David Négrier
5cb58d98a0 Adding correct SCSS file integration with Svelte 2021-05-17 16:41:09 +02:00
David Négrier
1885ea42a4 First working example with Svelte (the menu icon shows up on entering the game) 2021-05-17 16:39:56 +02:00
David Négrier
62cc1f73ca Tryig to fix webpack for Svelte 2021-05-17 16:39:56 +02:00
David Négrier
9bc79c3ed3 Adding Svelte to the project 2021-05-17 16:39:55 +02:00
kharhamel
f2dca82642 FIX: webpack config NodePolyfillPlugin 2021-05-17 16:30:19 +02:00
_Bastler
6d1b82974d Merge branch 'develop' of github.com:thecodingmachine/workadventure into dev_main_merge 2021-05-17 16:17:50 +02:00
kharhamel
a66d42e158 FEATURE: we now allow a global zoom level of 1.5 2021-05-17 16:11:38 +02:00
Lurkars
679c8a5ec5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-17 15:25:26 +02:00
_Bastler
d03f277061 Merge branch 'develop' of github.com:thecodingmachine/workadventure into dev_main_merge 2021-05-17 15:25:11 +02:00
_Bastler
cad36a7e40 updates 2021-05-17 15:24:56 +02:00
_Bastler
16aa859844 merge develop into main 2021-05-17 14:49:18 +02:00
kharhamel
a23e72454d FEATURE: added the env variable DISABLE_DIRTY_CHECKS 2021-05-17 14:47:34 +02:00
Lurkars
85edd47a49 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-17 14:19:55 +02:00
_Bastler
aac5676765 hotfix 2021-05-17 12:50:15 +02:00
kharhamel
1466d7481c FIX: fixed an error in webpack config 2021-05-17 12:20:07 +02:00
_Bastler
3e66a541e3 add website focus overlay 2021-05-16 18:48:48 +02:00
_Bastler
6ebec9ce68 add exitUrl script 2021-05-16 14:52:07 +02:00
_Bastler
c7623300f2 add input popup 2021-05-16 14:04:45 +02:00
_Bastler
c6eee39057 cowebsite 2021-05-16 10:50:57 +02:00
_Bastler
f5d0c27193 fix cowebsite 2021-05-16 10:42:05 +02:00
_Bastler
b4fc8c6d27 Added discussion scripting 2021-05-16 10:22:05 +02:00
Lurkars
498f23b5fc Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-15 19:02:02 +02:00
_Bastler
9c392856eb Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-15 18:57:25 +02:00
_Bastler
e7727e122e storage + nes.css 2021-05-14 16:41:41 +02:00
_Bastler
d6e99d5f4d fix overlay + typing focus 2021-05-14 11:59:38 +02:00
David Négrier
fe573893a1
Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues 
Setting "importsNotUsedAsValues": "error"
 2021-05-13 19:43:34 +02:00
_Bastler
19a56f9d3b fix joystick 2021-05-13 19:07:04 +02:00
Lurkars
cc44bfac77 port 2021-05-13 16:13:07 +02:00
_Bastler
e329c39741 fix perfomance 2021-05-13 15:56:51 +02:00
_Bastler
1f5af5199d animated tiles 2021-05-13 15:24:35 +02:00
_Bastler
6e9b2e8d31 merge develop, add animated tiles 2021-05-13 15:09:02 +02:00
GRL
43aad4ab14 phaserLayers managed by Gamemap 
Implementation of LayersFlattener
Implementation of Setting properties of a layer form script
Update show/hide layer form script
Update unit test of LayersIteratorTest
 2021-05-12 14:30:12 +02:00
David Négrier
4fcbc146ca Switching the Webpack configuration file to Typescript 
This switches the Webpack config file from JS to Typescript.
 2021-05-12 13:38:32 +02:00
David Négrier
06058cfc24 Upgrading Typescript target from ES2015 to ES2017. 2021-05-12 11:45:01 +02:00
David Négrier
664a5b6b91 Upgrading ESLint (and ignoring a bunch of interesting rules) 2021-05-12 11:44:41 +02:00
David Négrier
f57c01dee8 Refactoring Webpack files to remove prod file. The prod file is now inferred from the NODE_ENV variable. 2021-05-12 11:28:21 +02:00
David Négrier
8c1e01566a Upgrading all dependencies in front 
Upgrading to Webpack 5, Typescript 4, ...
 2021-05-12 10:35:14 +02:00