Commit Graph

1437 Commits

Author SHA1 Message Date
Johannes Berthel
8d4e0c3e88 added companion compatibility with phaser 3.54.0 2021-04-09 18:30:30 +02:00
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup 2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
2c84d9a07d position of popups changed
clear log in gameScene
2021-04-09 16:34:01 +02:00
DESKTOP-FMM8UI0\CLV
46cc7b3b3b add pannels 2021-04-09 14:35:15 +02:00
Johannes Berthel
32784d6775 Merge branch 'develop' into feature/player-companion 2021-04-08 23:37:36 +02:00
Johannes Berthel
73e515c236 don't show companion scene after first refresh 2021-04-08 18:42:05 +02:00
Johannes Berthel
2438470088 fixed rectangle resize issue 2021-04-06 20:31:08 +02:00
Johannes Berthel
fb90111cdf refactored companion selection scene 2021-04-06 20:12:10 +02:00
Johannes Berthel
187e21eed9 load texture inside game scene instead inside of inside companion class 2021-04-06 19:10:18 +02:00
Johannes Berthel
e5a196a42b implemented feedback 2021-04-06 18:54:45 +02:00
Johannes Berthel
7c6b73efdb don't show companion selection during first connexion flow 2021-04-06 18:36:46 +02:00
grégoire parant
575c1a9f23
Merge pull request #861 from joberthel/fix/use-selected-video-quality
Use selected video quality during webcam initialization
2021-04-06 15:08:03 +02:00
Johannes Berthel
6c512fb7cd fixed linting 2021-04-03 00:18:08 +02:00
Johannes Berthel
8c35860f2a show select companion scene after customize scene 2021-04-02 23:49:25 +02:00
Johannes Berthel
4aa082d83b Merge branch 'develop' into feature/player-companion 2021-04-02 23:40:30 +02:00
Johannes Berthel
3187520e7b companion behaviour fine tuning 2021-04-02 23:36:06 +02:00
Johannes Berthel
38c06ce8ff navigate from select character scene to select companion scene 2021-04-02 23:17:04 +02:00
Johannes Berthel
6ee4889773 added change companion button to menu 2021-04-02 23:13:03 +02:00
Johannes Berthel
52303c0bd6 added select companion scene 2021-04-02 23:00:51 +02:00
Johannes Berthel
4cfce15695 only remove listener if scene was not already destroyed 2021-04-02 21:29:45 +02:00
Johannes Berthel
e4d324e5fa removed unused import 2021-04-02 21:26:42 +02:00
Johannes Berthel
fc3a503bcf don't fail if companion texture is not found 2021-04-02 21:26:24 +02:00
Johannes Berthel
c07079051a transmit companion to remote players 2021-04-02 21:21:11 +02:00
Johannes Berthel
2ad712807b add companion only on local player 2021-04-02 17:14:34 +02:00
kharhamel
88cc15cd02 FEATURE: editing a room in the admin trigger a refresh system 2021-04-02 15:22:02 +02:00
Johannes Berthel
5a91e15580 add companion to remote player 2021-04-01 18:51:51 +02:00
David Négrier
8529037493
Merge pull request #864 from thecodingmachine/singledomain
Adding support for single domain deployments
2021-04-01 09:04:26 +02:00
Johannes Berthel
80a5d2e30e added random companion to player 2021-04-01 00:33:05 +02:00
kharhamel
a30923ceae FEATURE: improved the fullscreen and close buttons to be in the aside element 2021-03-31 18:39:51 +02:00
David Négrier
adf2e60d54 Fixing issue with double slash in websocket URL 2021-03-31 17:50:27 +02:00
David Négrier
e166c69b58 Fixing reading of the relative URL in RommConnection 2021-03-31 16:38:51 +02:00
David Négrier
11a1428c89 Fixing broken live-reload 2021-03-31 16:20:21 +02:00
David Négrier
f2e64c8763 Fixing missing API_URL warning 2021-03-31 16:20:11 +02:00
David Négrier
3ef1f0dc7b [Breaking change] UPLOADER_URL and ADMIN_URL are now true URLs (and not only host name) and API_URL is replaced by PUSHER_URL
API_URL is still accepted for BC compatibility of the self-hosted deployments.

This will allow deploying on a single domain, using a reverse proxy that acts on the path.
This however means that the config needs to be changed for all WorkAdventure deployments.
2021-03-31 16:00:14 +02:00
David Négrier
cd7a332b4c Improving error throwing and handling in pusher/admin/front 2021-03-31 15:49:01 +02:00
David Négrier
c2398efdc4
Merge pull request #860 from thecodingmachine/dependabot/npm_and_yarn/front/y18n-4.0.1
Bump y18n from 4.0.0 to 4.0.1 in /front
2021-03-31 09:25:14 +02:00
Johannes Berthel
441416f312 use frame rate setting for initialization 2021-03-30 22:38:44 +02:00
David Négrier
dd0d1fa49f
Merge pull request #854 from thecodingmachine/loadhttpsmapsfromhttp
Allow loading https maps from http protocol
2021-03-30 17:57:38 +02:00
David Négrier
a68cf38cdc
Merge pull request #856 from thecodingmachine/alonemode
Adding an "alone" mode
2021-03-30 17:56:19 +02:00
dependabot[bot]
cff4c154ce
Bump y18n from 4.0.0 to 4.0.1 in /front
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 14:33:07 +00:00
David Négrier
02fb42b68a
Merge pull request #790 from thecodingmachine/iframe_api
Adding an API for inter-iframe communication
2021-03-30 16:31:30 +02:00
David Négrier
559e15ebb6 Adding an "alone" mode
In "alone" mode (or single-player mode), WorkAdventure does not connect to the server at all.
In order to enter the "alone" mode, you need to add "?alone=true" to the URL.

"alone" mode can be useful for tutorials (First Time User Experience) where you want to explain how WorkAdventure works without being disturbed by other users.
2021-03-30 16:08:49 +02:00
David Négrier
b6edefbe4e Allow loading https maps from http protocol
In a development environment, we often run in HTTP.
The problem is that WorkAdventure will attempt to load maps using the HTTP protocol (even if the map is on a remote server that is available only in HTTPS).
This commit adds a "fallback". If we are in HTTP (so in a development environment) and if the map fails to load correctly, we will try again, but in HTTPS.

This allows development environment to load maps hosted on a HTTPS enabled server easily.
2021-03-28 18:35:01 +02:00
David Négrier
ee53d8f0b8 Hiding iframe in prod 2021-03-28 17:21:10 +02:00
David Négrier
8b90a14c39 Fix import 2021-03-28 17:07:00 +02:00
David Négrier
aaaa192b71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api
# Conflicts:
#	front/dist/.gitignore
#	front/dist/index.tmpl.html
#	front/src/Phaser/Game/GameScene.ts
#	front/src/WebRtc/CoWebsiteManager.ts
2021-03-28 16:53:15 +02:00
David Négrier
98aa94bb12 Minor changes 2021-03-28 16:36:02 +02:00
Johannes Berthel
5375528d7c use map tilewidth instead of hardcoded values 2021-03-27 13:57:50 +01:00
kharhamel
886daebfea improved the unloading process to not create a useless socket 2021-03-26 14:19:37 +01:00
DESKTOP-FMM8UI0\CLV
8764fe5de5 Popup openWebSite
Add possibility to open a website with a popup
3 cases :
Open page
GoTo Page
OpenCoWebsite
2021-03-25 17:12:53 +01:00
kharhamel
99e6743c01 FIX: resizing on wide screen on chrome now use the correct coordinates 2021-03-25 14:35:51 +01:00
Kharhamel
dc1a5da175
Merge pull request #837 from thecodingmachine/fixCameraHelpPopup
FIX: help camera settings popup now only show up once
2021-03-24 16:05:21 +01:00
kharhamel
0b352fc5dc FIX: help camera settings popup now only show up once 2021-03-24 15:59:18 +01:00
kharhamel
43921e3fcc FIX: fixed a bug with fullscreen mode 2021-03-24 15:51:18 +01:00
Kharhamel
ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage
Warning message
2021-03-24 14:27:13 +01:00
kharhamel
8d6c1a50bf FEATURE: warning message when world is near full capacity 2021-03-23 17:44:47 +01:00
DESKTOP-FMM8UI0\CLV
e05c25a857 replace let for const for variables non reassigned 2021-03-23 17:15:22 +01:00
Kharhamel
7765775df5
Merge pull request #825 from workadventure-xce/audio_player_improvements
Audio player improvements
2021-03-23 14:07:20 +01:00
PizZaKatZe
821f91e996 Finer steps for audio volume 2021-03-22 20:10:27 +01:00
PizZaKatZe
599fdd6ceb Fix group icons and audio attenuation 2021-03-22 20:09:11 +01:00
TabascoEye
e6accd711d Store muted setting of audio player in local storage
This commit was originally authored by @TabascoEye, then rebased and
improved by @pizkaz:

* refactors local user storage, adding audio player settings
* stores "muted" state of audio player in local store
2021-03-22 20:09:11 +01:00
PizZaKatZe
5bd6f49846 Fix (now legacy) 'playAudioLoop' property 2021-03-22 20:09:11 +01:00
PizZaKatZe
fdbcd98a9a Implement audio volume and loop properties 2021-03-22 20:09:11 +01:00
PizZaKatZe
132c6c9ad6 Fix volume auto-reduction in conversations 2021-03-22 20:09:09 +01:00
PizZaKatZe
5a7e67f5df Reflect volume change in audio control 2021-03-22 20:06:55 +01:00
PizZaKatZe
20d3236e73 Fix audio control box appearance 2021-03-22 20:06:55 +01:00
David Négrier
f9a2097bc9
Merge pull request #828 from thecodingmachine/develop
Deploy 2021-03-22
2021-03-22 16:42:28 +01:00
David Négrier
ce0ede7613
Merge pull request #805 from thecodingmachine/dependabot/npm_and_yarn/front/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4 in /front
2021-03-22 16:31:59 +01:00
David Négrier
6bb757e8b5
Merge pull request #824 from workadventure-xce/fix/front-page-template
Fix/front page template
2021-03-22 16:30:53 +01:00
Kharhamel
04bd60ca26
Merge pull request #827 from workadventure-xce/fix/jitsi_integration
Fix Jitsi integration
2021-03-22 16:27:32 +01:00
DESKTOP-FMM8UI0\CLV
3ef3561b57 no message 2021-03-22 16:10:21 +01:00
PizZaKatZe
318c63ab90 Fix Jitsi integration
Jitsi iframes are rendered directly in the cowebsite div next to the
cowebsite > main element. This patch fixes the situation.
2021-03-22 11:36:14 +01:00
PizZaKatZe
13fcda7bcf Remove scroll bars 2021-03-21 12:55:14 +01:00
PizZaKatZe
c0bf5755ed front: Fix page template 2021-03-21 11:28:02 +01:00
PizZaKatZe
97ec721c2a front: Fix page template indentation 2021-03-21 11:28:02 +01:00
GRL
e50c8bc354 Suppression of *{...} in every HTML files because the style.ccs file already declare it.
Suppression unused code
2021-03-19 16:21:35 +01:00
GRL
0eb16bce6f Suppression width in Html file 2021-03-19 15:58:02 +01:00
GRL
1cfb22f695 Creation of the HelpCameraSettingsScene
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
2021-03-19 15:40:07 +01:00
GRL
0b00055eda Use includes instead of indexOf 2021-03-19 14:40:18 +01:00
GRL
c654f722e3 Add Firefox image
Check permissions in the game
Button Continue to continue without allowing camera and microphone
2021-03-19 12:04:37 +01:00
Gregoire Parant
d68406d5e1 Create input need page 2021-03-19 12:02:42 +01:00
kharhamel
32fdfaab35 edited CoWebsiteManager to manage vertical resizing 2021-03-18 16:11:22 +01:00
kharhamel
0701e607fa added sass loader to the project and put the cowebsite style in its own sass file 2021-03-18 12:37:05 +01:00
kharhamel
f9c8b4131c added fullscreen 2021-03-17 18:57:00 +01:00
kharhamel
272be3eba0 improve the visual of the cowebsite 2021-03-17 18:35:19 +01:00
kharhamel
3f6c61633a FEATURE: complete control over the iframe size 2021-03-17 18:34:12 +01:00
Kharhamel
19856c0ee9
Merge pull request #783 from Moini/patch-1
Improve visibility of close button for embedded web pages
2021-03-17 14:35:11 +01:00
David Négrier
ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
2021-03-16 20:37:12 +01:00
DESKTOP-FMM8UI0\CLV
662134498c Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-03-12 17:06:42 +01:00
David Négrier
086b88b09a Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV
c5c8770a60 Add First Version of Tuto
PopUp
Player Control disable
Fake bubble displayed
2021-03-12 16:39:29 +01:00
kharhamel
fe8c75610d FIX: player anims correctly stop on the idle frame 2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV
fa4d917729 Resolve conflit with GameScene.ts 2021-03-11 16:03:39 +01:00
DESKTOP-FMM8UI0\CLV
6441fa71d3 Adding placeHolder Popup tuto to Map2
need to cut player controller and simulate bobble
2021-03-11 10:58:48 +01:00
Gregoire Parant
2fcb8a76b1 Merge branch 'master' into develop
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts
2021-03-11 02:22:05 +01:00
Gregoire Parant
2cf99df2da Hot Fix report 2021-03-11 02:03:06 +01:00
Gregoire Parant
46cb9333e6 HotFix message in back 2021-03-11 01:25:36 +01:00
DESKTOP-FMM8UI0\CLV
f9f618094d adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js 2021-03-10 17:22:39 +01:00
dependabot[bot]
d95c71281f
Bump elliptic from 6.5.3 to 6.5.4 in /front
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-10 13:26:46 +00:00
DESKTOP-FMM8UI0\CLV
8d0411e8a3 can manage position and width/height of a popUp using a square in Tiled 2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV
5e4940dba6 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Removing closeOnClick as it is not implemented
  Adding a Popup object with a close() method on it.
2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV
f7f8be24bc Set Position of the popUp with pos of an object in floorLayer object group 2021-03-10 08:57:49 +01:00
David Négrier
7fddcc28f1 Removing closeOnClick as it is not implemented 2021-03-09 18:57:25 +01:00
David Négrier
bb8b222c22 Adding a Popup object with a close() method on it. 2021-03-09 18:51:30 +01:00
David Négrier
18464e4942 Adding button clicked handling 2021-03-09 18:05:07 +01:00
Kharhamel
21cc842c33
Merge pull request #793 from thecodingmachine/adminWorldsLimit
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
2021-03-09 17:45:43 +01:00
DESKTOP-FMM8UI0\CLV
4545de8af1 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Adding button clicked handling

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-03-09 17:12:28 +01:00
DESKTOP-FMM8UI0\CLV
d29e0819f4 Get position of an object in Tile to set popUp Position 2021-03-09 17:07:14 +01:00
kharhamel
8abc34c631 FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call 2021-03-09 16:34:19 +01:00
David Négrier
1e002f93ed Implementation of openPopup script method (WIP) 2021-03-09 16:21:14 +01:00
David Négrier
ed2ce68f37 Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api
# Conflicts:
#	front/dist/.gitignore
#	front/src/Phaser/Game/GameScene.ts
2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV
bbf5003e16 move font press start 2P from index.html to style.css 2021-03-09 14:21:11 +01:00
DESKTOP-FMM8UI0\CLV
b175b7164d Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup
* 'develop' of https://github.com/thecodingmachine/workadventure:
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
  Revert "Adding back admin in develop branch CI"
  Adding back admin in develop branch CI
  Fixing GA tag not included in play domain
  FEATURE: better implementation of the admin global message
  Fix ci
  Update private access
  Allow URLs relative to map base in iframe / openWebsite

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV
afac042706 supp debug log 2021-03-09 13:53:46 +01:00
David Négrier
2bef328d8a Adding the abaility to track users entering/leaving a zone in the script language. 2021-03-08 18:58:38 +01:00
DESKTOP-FMM8UI0\CLV
858bf0b384 Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property
Adding map "Tuto2", the FTUE map
2021-03-08 09:28:15 +01:00
David Négrier
6fbf165c91 Adding the ability to register a single script using the "script" attribute at the map property level. 2021-03-07 21:02:38 +01:00
David Négrier
7d67f55012 Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages. 2021-03-06 16:00:07 +01:00
David Négrier
e927e0fa16 Adding ability to listen to user types chat messages using WA.onChatMessage 2021-03-06 15:26:07 +01:00
David Négrier
5178dff108 Adding strong checks on messages exchanged using generic-type-guard 2021-03-05 16:50:54 +01:00
David Négrier
83fa23a82d Fixing eslint 2021-03-05 11:47:04 +01:00
David Négrier
15405633d1 Fixing GA tag not included in play domain
The GA tag was not properly included because the index.html file that contained it was overwritten by Webpack's HtmlWebpackPlugin.
2021-03-05 10:00:11 +01:00
David Négrier
eb93a04341 Adding an API for inter-iframe communication
Adds a first version of an API to communicate between an iFrame opened by WorkAdventure and WorkAdventure itself.
The first API method is a method allowing to add messages in the chat, from the iFrame.

Comes with a test file.
2021-03-04 19:00:00 +01:00
David Négrier
bf8e8bf777
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url
Allow URLs relative to map base in iframe / openWebsite
2021-03-04 18:21:48 +01:00
kharhamel
ad7e16c33b FEATURE: better implementation of the admin global message 2021-03-04 16:18:06 +01:00
David Négrier
e0540790e1 Translating button 2021-03-01 14:36:18 +01:00
Moini
95da470a89
Improve visibility of close button for embedded web pages
The button (a white x) wasn't visible on white background. Now it is. Also is a little bit larger and changes color on hover.
2021-03-01 14:08:56 +01:00
Lukas Bachschwell
2772d72eba
Fix report userId in report menu
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
2021-02-24 21:32:16 +01:00
David Négrier
6e9c715980
Merge pull request #739 from t10r/fix/multi-user-videochat-mode
fix multi user videochat mode
2021-02-19 14:54:38 +01:00
David Négrier
6f06b92395
Merge pull request #760 from thecodingmachine/turncredentials
Fixing screensharing Coturn credentials
2021-02-18 14:09:33 +01:00
David Négrier
13a20a0ef0 Fixing screensharing Coturn credentials
When screensharing is initiated by the user, we previously did not send the correct Coturn credentials.
We now send the last credentials received from the Video stream.
2021-02-18 11:52:30 +01:00
grégoire parant
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig
Fix last properties changed after trigger change position
2021-02-18 11:37:41 +01:00
Gregoire Parant
772c3174be Fix last properties changed after trigger change position 2021-02-18 11:32:37 +01:00
grégoire parant
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig
Jitsi config
2021-02-18 10:12:16 +01:00
Gregoire Parant
8a2954eab9 Fix new conf feature 2021-02-18 09:38:27 +01:00
grégoire parant
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig
Merge Jitsi config
2021-02-17 20:34:31 +01:00
Gregoire Parant
5ddf909fe6 Remove unless export constante 2021-02-17 20:26:33 +01:00
Gregoire Parant
fff0cbc3f6 Revert message exit 2021-02-17 19:40:00 +01:00
Gregoire Parant
9b7b3eb140 Update feedback @tabascoeye 2021-02-17 19:31:05 +01:00
Gregoire Parant
ce423c9fec Remove exit trigger action 2021-02-17 19:29:59 +01:00
Gregoire Parant
83fc7d0cc0 Merge branch 'develop' into exitTriggerAction
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
Gregoire Parant
baae1e8125 Update to restore previous config 2021-02-17 19:21:37 +01:00
Gregoire Parant
e8b1b286a3 Merge Jitsi config 2021-02-17 18:49:55 +01:00
David Négrier
ae1d00c828
Merge pull request #736 from MisterErwin/patch-1
Fix offsets of SpeechBubble.ts
2021-02-16 20:02:03 +01:00
David Négrier
43b48ce555
Merge pull request #737 from MisterErwin/patch-2
Do not change rooms if scene failed to load
2021-02-16 20:01:00 +01:00
David Négrier
ddcb5ede59
Merge pull request #742 from znerol-forks/fix/huge-jitsi-url
Fix jitsi URLs growing indefinitely in length
2021-02-16 19:52:56 +01:00
David Négrier
9affa36608
Merge pull request #746 from thecodingmachine/turncredentials
[Feature] Connect to a Coturn server using REST API
2021-02-16 19:32:21 +01:00
kharhamel
e21868ed3b FIX: current audio and video status are overwriten by jitsi config 2021-02-16 18:25:23 +01:00
David Négrier
6b00355ea8 Fixing WebRtc user name / password when using TURN REST API 2021-02-16 18:13:30 +01:00
David Négrier
12ef2820bf Refactoring parameters passed to ScreenSharingPeer 2021-02-16 11:08:03 +01:00
David Négrier
cdb3cfdc81 [Feature] Connect to a Coturn server using REST API
This allows connecting to a TURN server with temporary passwords.
The passwords are expiring after 4 hours.
2021-02-16 11:06:05 +01:00
znerol
9670f92a08 Allow URLs relative to map base in iframe / openWebsite 2021-02-16 10:53:50 +01:00
David Négrier
e07efbdf28
Merge pull request #698 from thecodingmachine/fix/deploy-cleanup
Adding docker-compose.prod.yaml to ease deployment
2021-02-16 10:35:18 +01:00
znerol
4fcdad1551 Fix jitsi URLs growing indefinitely in length 2021-02-15 10:36:56 +01:00
Tim Schlüter
05b829da70 fix multi user videochat mode 2021-02-13 21:19:45 +01:00
MisterErwin
aff4c8d145
Do not change rooms if scene failed to load
Sometimes a following room fails to load (e.g., #582) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).
2021-02-13 14:15:09 +01:00
MisterErwin
511cd99e22
Fix offsets of SpeechBubble.ts
Since some recent optimizations, they are being added on top of the player, which makes the offset redundant.
2021-02-13 14:04:28 +01:00
kharhamel
0c892e0243 FEATURE: implemented a client side blacklist 2021-02-12 19:15:24 +01:00
Gregoire Parant
b92b7304b0 Fix to use clear All Keys 2021-02-11 21:48:24 +01:00
David Négrier
64cd07cc39
Merge pull request #726 from thecodingmachine/fixHtmlAnchorElement
Update to use Anchor type
2021-02-11 18:08:52 +01:00
David Négrier
bc35ade8df Improving urlify 2021-02-11 18:03:14 +01:00
David Négrier
c8fc8a2834
Merge pull request #699 from thecodingmachine/pixelartmode
Switching Phaser to pixelart mode
2021-02-11 17:20:20 +01:00
David Négrier
42aee9f5c8
Merge pull request #722 from thecodingmachine/jitsislugify
Slugifies the Jitsi room name
2021-02-11 17:17:58 +01:00
David Négrier
35fdd3bf29
Merge pull request #717 from kalkspace/add-stun-server-env-variable-with-fallback
Add STUN_SERVER env variable with fallback
2021-02-11 17:17:36 +01:00
Gregoire Parant
c5916e7b6d Fix ci 2021-02-11 15:06:12 +01:00
Gregoire Parant
0d104cb307 Update to use Anchor html 2021-02-11 14:49:32 +01:00
David Négrier
91fddd6893 Slugifies the Jitsi room name
This will avoid Jitsi breaking on unexpected characters and displaying a HTTP 404 error.
2021-02-10 13:51:17 +01:00
David Négrier
f6e93da48a Fixing loading logo being displayed when nothing was loaded 2021-02-10 12:08:16 +01:00
David Négrier
8389fad877 Disabling video background by default on Jitsi
(because it consumes a lot of CPU)
2021-02-10 11:20:05 +01:00
David Négrier
e7ddeedb3e Disabling Join/Leave notifications by default 2021-02-10 11:13:47 +01:00
David Négrier
a5bdf68246 Moving property reading inside startJitsi (startJitsi is called at 2 different places) 2021-02-10 11:08:57 +01:00
Mickael Chimansky
5cb9624b0b fixup! Jitsi config properties 2021-02-09 20:31:49 +01:00
Mickael Chimansky
9c4d0aa32f Jitsi config properties 2021-02-09 16:05:21 +01:00
Sebastian Wiesendahl
b6807d274b Add STUN_SERVER env variable with fallback
default: "stun:stun.l.google.com:19302"

Make STUN_SERVER available for app config

Change also the STUN_SERVER for ScreenSharingPeer
2021-02-09 13:09:17 +01:00
David Négrier
969c9fd544 Fixing loading logo being displayed when nothing was loaded 2021-02-09 12:41:35 +01:00
David Négrier
adb535d1b6
Merge pull request #703 from thecodingmachine/socialNetworkLink
Social network link anonymous connexion
2021-02-04 16:10:25 +01:00
Gregoire Parant
03f1f5bf75 Update feedback @moufmouf 2021-02-04 16:05:05 +01:00
Gregoire Parant
59b4b168e9 Social network link anonymous connexion
In menu, add social newtork link when user is connected in anonymous mode
2021-02-03 23:14:31 +01:00
Gregoire Parant
4de9b8ba40 Fix icon discussion
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
2021-02-03 23:11:33 +01:00
grégoire parant
c41c058fb0
Merge pull request #527 from oliverlorenz/feature/iframe-feature-policy
feat: adds property openWebsitePolicy property to set "allow" property in iframe
2021-02-03 17:38:35 +01:00
David Négrier
9c9f046b16
Merge pull request #668 from piitaya/fix_game_not_centered
Use canvas instead of div container for calculating the game size
2021-02-03 14:06:09 +01:00
David Négrier
246174c365 Removing useless file 2021-02-03 12:29:56 +01:00
grégoire parant
f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser
Permit puiblic report
2021-02-02 18:09:25 +01:00
David Négrier
8572959cb0
Merge pull request #690 from thecodingmachine/newLogo
Update Loading page
2021-02-02 17:26:48 +01:00
David Négrier
3f274df813 Redesigning loading bar 2021-02-02 17:17:00 +01:00
David Négrier
e757d63924 Switching Phaser to pixelart mode
To be honest, I'm not sure what it does exactly (it is supposed to prevent antialiasing and it is rounding coordinates for rendering sprites, but I don't see a difference yet.
2021-02-02 12:04:50 +01:00
David Négrier
cc53023586 Using locally built images 2021-02-02 11:34:29 +01:00
David Négrier
274f5eba4c Reworking docker-compose.prod.yaml to make it generic while still having a front container configurable 2021-02-02 11:19:24 +01:00
Manfred Stock
0afbb5412e Improve display of websites not specifying background color
The `index.html` of the front-end specifies `#000` as background color,
however, it seems like various websites found 'in the wild' don't
specify their own background color and thus default to `transparent`. As
a result of this, they tend to become mostly unreadable when displayed
using `openWebsite` since they often assume that they get displayed on a
white background. Setting white as background color on the container
element of the `<iframe>` works around this issue.
2021-02-01 22:48:10 +01:00
Gregoire Parant
788e22e8b0 Fix loading logo of WorkAdventure 2021-02-01 16:52:28 +01:00
David Négrier
686427f6fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into fix/deploy-cleanup
# Conflicts:
#	front/Dockerfile
2021-02-01 14:00:07 +01:00
Gregoire Parant
f99db4856f Add WorkAdventure logo 2021-01-30 20:33:31 +01:00
Gregoire Parant
ac2bc76239 change style report button 2021-01-30 14:08:11 +01:00
TabascoEye
58b7d85bf3
bugfix and linting
* use 'const' on constraints which never change
* also re-enable constraints ater mic was re-enabled (after mute/unmute)
2021-01-30 02:24:36 +01:00
TabascoEye
31a0d08c76
disable automatic gain control on microphone
AGC really makes the soundqulity way worse than it could be.
Especially since it is so noticeable when entering a Jitsi where AGC is disabled (and suddenly some people sound much better).

In the long run, this should probably be configurable. On the other hand the setting changes the audio _going out_ from a user, so it might be hard for him to judge which settings are a good or a bad idea…
2021-01-30 02:13:03 +01:00
Gregoire Parant
7eb38fae83 Permit puiblic report
- Create report html
 - Add report flag
2021-01-29 21:09:10 +01:00
David Négrier
2f01677849
Merge pull request #681 from thecodingmachine/downgradephaser3.24
Downgraded phaser version to 3.24.1
2021-01-28 23:08:47 +01:00
kharhamel
f2c3d6f158 downgraded phaser version to 3.24.1 2021-01-28 23:03:06 +01:00
David Négrier
ce56a5cba1
Revert "downgraded phaser version to 3.22" 2021-01-28 22:38:20 +01:00
Paul Bottein
a8b5e8599f use HTMLCanvasElement 2021-01-28 21:09:41 +01:00
Paul Bottein
608a9ad347 use type guard 2021-01-28 21:07:17 +01:00
Paul Bottein
b52c546a8c Use canvas instead of div container for calculating the game size 2021-01-28 21:04:43 +01:00
kharhamel
e7120317c1 downgraded phaser version to 3.22 2021-01-28 19:15:34 +01:00
David Négrier
b7b2934106
Merge pull request #672 from Amirault/tam_use_type_guard_on_html_element
Use type guard for html element subtype
2021-01-28 17:13:02 +01:00
Tony Amirault
72799d4f0e added end of line 2021-01-28 15:31:09 +01:00
Tony Amirault
3a05ef6640 package.lock removed 2021-01-28 15:30:20 +01:00
Kharhamel
9849e70613
Merge pull request #670 from thecodingmachine/httpCypress
Removed cypress from the project
2021-01-28 15:03:12 +01:00
kharhamel
ca231eee4a remove cypress from the project :( 2021-01-28 14:56:24 +01:00
Tony Amirault
cdbae5fa43 use type guard on html element 2021-01-27 18:33:40 +01:00
David Négrier
8eebed1829 Removing pipeline related code
This code is broken since Phaser 3.50 and we are facing weird issues with MacOS memory leaks and crashes.
Removing this code will remove one potential suspect.
2021-01-27 11:18:07 +01:00
grégoire parant
86f1099247
Merge pull request #648 from thecodingmachine/customCharacterLadyLoading
Fix custom character lazy loading
2021-01-26 15:27:46 +01:00
Gregoire Parant
45b355f780 Refactor lazy loading 2021-01-26 15:21:23 +01:00
Kharhamel
556d5a4695
Merge pull request #658 from thecodingmachine/lockUserBanned
Lock user banned
2021-01-26 14:06:35 +01:00
Gregoire Parant
1dd2858424 Fix feadback @Kharhamel 2021-01-26 14:04:42 +01:00
Gregoire Parant
e2695c58af Verify existing texture 2021-01-26 09:16:39 +01:00
Gregoire Parant
803be36def Merge branch 'develop' into customCharacterLadyLoading 2021-01-26 09:02:17 +01:00
Gregoire Parant
c6903cc4c5 Use Error scene and add banned message 2021-01-26 08:57:10 +01:00
David Négrier
a4cb39eef3
Merge pull request #653 from thecodingmachine/maccrash
Add a parameter to allow changing phaser renderer
2021-01-25 16:52:15 +01:00
Gregoire Parant
8de05c39c1 Lock user when he was banned 2021-01-25 14:10:16 +01:00
Gregoire Parant
beb53df364 Error problem open new map 2021-01-25 13:18:57 +01:00
Gregoire Parant
5f88a1a0b9 Exit trigger action
- [x] Add trigger message custom
- [x] Add trigger for exit map
- [x] Update documentation
2021-01-25 12:21:40 +01:00
David Négrier
c2c8680dae Fix linting 2021-01-25 12:02:00 +01:00
David Négrier
8609cda0d0 Add a parameter to allow changing phaser renderer
Recently, some Macs have been crashing running WorkAdventure.
Hard to say if this is related to Phaser 3.50 upgrade or to the new MacOS version.

It happens mostly on Mac Air and might be related to WebGL rendering.

This commit allows to switch to CANVAS renderer by adding `?phaserMode=canvas` in the URL
2021-01-25 11:18:48 +01:00
Kharhamel
18fb508828
Merge pull request #639 from thecodingmachine/betterLink
changed the color of the chat links and unit test
2021-01-25 10:42:32 +01:00
Kharhamel
39194b5531
Merge pull request #642 from tabascoeye/patch-1
cleanup when closing the scene
2021-01-25 10:35:01 +01:00
Kharhamel
d32fca9777
Merge pull request #597 from psy/feature_streams
add remote files and streams to playAudio
2021-01-25 10:33:43 +01:00
Gregoire Parant
232ac6d5d1 Error lazy loading
Update loader custom characters
2021-01-24 18:00:30 +01:00
Gregoire Parant
0133609770 clean 2021-01-24 16:06:52 +01:00
Gregoire Parant
75d8d46c62 clean 2021-01-24 16:02:10 +01:00
Gregoire Parant
d93a8da828 Fix custom character lazy loading 2021-01-24 15:57:47 +01:00
TabascoEye
39b433eef5
Update GameScene.ts
stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene
Fixes #633
2021-01-23 01:16:13 +01:00
kharhamel
4ad7f4d5a3 changed the color of the chat links and unit test 2021-01-22 15:06:41 +01:00
David Négrier
3d84a9c8cd Turning French 'Moi' into English 'Me' 2021-01-21 10:16:08 +01:00
David Négrier
bbf9325396 Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths 2021-01-21 09:40:11 +01:00
Thomas Basler
14b328c733 Removed hard coded default map
You can apply local maps using the maps vhost as previously.
But it's also possible to specify external maps by prepending http or https.
2021-01-20 22:56:21 +01:00
David Négrier
84f85effe5
Merge pull request #628 from thecodingmachine/template-analytics
Template google analytics data (2)
2021-01-20 18:03:28 +01:00
David Négrier
15b3e87bd1 Renaming TRACKING_NUMBER to GA_TRACKING_ID 2021-01-20 17:30:11 +01:00
David Négrier
aa9a21ad4c
Merge pull request #581 from Informatic/fix/firefox-webcam
front: fix webrtc webcam feed on Firefox
2021-01-20 16:27:45 +01:00
David Négrier
b03abee481 Fixing admin links 2021-01-20 10:34:34 +01:00
kharhamel
49531bb8fa FEATURE: updated phaser to version 3.52 2021-01-19 18:31:58 +01:00
Jean-Philippe Evrard
e2f400472f Template google analytics data
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.

This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.

This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
Gregoire Parant
c95419f0e7 Prepar release 1.1.0
Automatically redirect on floor0 of TCM map
2021-01-18 22:52:25 +01:00
David Négrier
c466ba8ca5
Merge pull request #601 from thecodingmachine/featureBan
Create ban feature by admin console
2021-01-18 19:31:51 +01:00
David Négrier
65d2c3dfb0 Disabling explicit any check on error handling 2021-01-18 15:36:02 +01:00
Gregoire Parant
679dbd4215 Fix focus cam on select cam scene 2021-01-18 10:40:13 +01:00
David Négrier
4234b38910 Better error message in case of 404 2021-01-17 22:40:54 +01:00
David Négrier
adca51f6de Replacing FourOFourScene with more generic ErrorScene 2021-01-17 20:42:45 +01:00
kharhamel
fd29826556 fixed a crash linked to incorrect textureDescriptors 2021-01-14 14:47:02 +01:00
psy
8d67947bc1 move map url to else case 2021-01-14 11:48:06 +01:00
psy
f431e769cc add remote files and streams to playAudio 2021-01-14 11:45:14 +01:00
David Négrier
8cf481ec49 Fixing bug when no WebGL is available
The switch to Phaser 3.50 introduced a bug when WebGL is not available in a browser.
The changes in this commit prevent calls to the WebGL pipeline if the pipeline is not available.
2021-01-13 18:39:28 +01:00
grégoire parant
8ffba3157a
Merge pull request #588 from thecodingmachine/customiseCharacters
Customise characters with admin console
2021-01-13 16:47:13 +01:00
Gregoire Parant
512be7acd2 New basic characters 2021-01-13 16:46:24 +01:00
Piotr Dobrowolski
33b9bd773f *: Dockerfiles cleanup, docker-compose.prod.yaml
New docker-compose.prod.yaml should provide a production-ish deployment
of WorkAdventure
2021-01-12 22:32:37 +01:00
Gregoire Parant
993c58cf8e Fix select rectangle for customize scene 2021-01-12 19:49:48 +01:00
Gregoire Parant
987c80c9c4 Fix menu 2021-01-12 19:48:48 +01:00
grégoire parant
0f7f42b6f1
Merge pull request #566 from thecodingmachine/screanSharing
Fix screen sharing
2021-01-12 19:24:06 +01:00
Gregoire Parant
123ee4bc43 Fix responsive and limite select cursor 2021-01-12 15:29:26 +01:00
Gregoire Parant
f8d4b696e8 Customise characters with admin console
- Add new characters choise
 - Display on 3 line of 6 pers
 - Add custom characters from admin console wilth level -1
2021-01-12 13:19:51 +01:00
grégoire parant
648e6aef97
Merge pull request #561 from thecodingmachine/linkNotClickable
Verify URL in message
2021-01-12 11:30:11 +01:00
Piotr Dobrowolski
7f8cc76eb7 front: fix webrtc webcam feed on Firefox
Seems like Firefox doesn't support specifing both exact and ideal
constraints...
2021-01-10 17:05:48 +01:00
kharhamel
472fbb1de0 All player textures are now lazy-loaded 2021-01-08 11:44:41 +01:00
Piotr Dobrowolski
af260ad229 front: add AnimatedTiles plugin 2021-01-07 18:37:57 +01:00
Kharhamel
c2d0cda441
Merge pull request #572 from thecodingmachine/master
Master
2021-01-07 14:00:45 +01:00
Gregoire Parant
e8f1b2d048 Add clear array peer connection sharing 2021-01-07 12:58:45 +01:00
kharhamel
3ce8427378 fixed a game crashed because of lack of animations and improved the character class 2021-01-07 12:46:13 +01:00
Gregoire Parant
a88ad3cf4d Dont delete PeerSharingConnection because it will be resuse
When user try to screen charing with same user, the event send is not a offer but renegociation. So could clear arry only when user out of circle.
2021-01-07 12:13:12 +01:00
Gregoire Parant
018f01e878 Increase stability camera and microphone permission 2021-01-07 11:02:00 +01:00
Gregoire Parant
8c89b5e0b1 Permit to change style when getCamera was ready and permission accorded 2021-01-07 10:30:28 +01:00
Gregoire Parant
d4c7a20dfa Update feedback @moufmouf 2021-01-07 09:42:11 +01:00
Gregoire Parant
1659fa400f Increase stability to force stopped screen sharing 2021-01-06 17:09:17 +01:00
kharhamel
fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
Gregoire Parant
73d7e798e9 Upgrade conversion
When user send multi message, scroll on last message
2021-01-06 17:08:13 +01:00
kharhamel
1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +01:00
Gregoire Parant
4397ff7712 Update style and focus keyboard 2021-01-06 13:36:18 +01:00
Gregoire Parant
438469ae24 Verify URL in message 2021-01-06 12:20:02 +01:00
dependabot[bot]
c7ed0bf8bb
Bump axios from 0.20.0 to 0.21.1 in /front
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-05 23:50:25 +00:00
kharhamel
6caa0e5b62 HOTFIX: the map property exitUrl now accept relative links that are deep enough to rewrite the base url 2021-01-05 18:23:17 +01:00
David Négrier
dea7d6dba7
Merge pull request #541 from Informatic/feature/map-sounds
[rC3] front: implement map sounds
2021-01-05 13:42:50 +01:00
David Négrier
e02e051f91
Merge pull request #544 from thecodingmachine/updateMenu
Update menu design
2021-01-04 18:10:27 +01:00
Gregoire Parant
ac92cbc8f7 Crate share menu and fix menu design 2021-01-04 17:13:41 +01:00
Piotr Dobrowolski
28d687e338 front: implement map sounds 2021-01-04 16:57:31 +01:00
Oliver Lorenz
7c89cf0e47 feat: adds property openWebsitePolicy to set allow property in iframe 2020-12-29 23:17:16 +01:00
Dariusz Niemczyk
640d994dda
Properly fix the CustomizeScene by limiting input
When left/right arrow is being held on chrome the Phaser gets into infinite rendering loop that doesn't crash the browser but makes it slow to a crawl.
2020-12-27 11:00:23 +01:00
Dariusz Niemczyk
c9250c08f3
Fix CustomizeScene killing CPU
Fixes #518
2020-12-27 10:47:56 +01:00
David Négrier
e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage
Manage Local Storage customers player error
2020-12-18 16:33:36 +01:00
Gregoire Parant
a1fd209578 Fix catch error 2020-12-18 16:30:22 +01:00
David Négrier
36f886aed6 Fixing cat running too fast on reconnect scene because animations were duplicated 2020-12-18 16:08:04 +01:00
David Négrier
df114bc1ce Fixing broken reconnection 2020-12-18 15:59:07 +01:00
Gregoire Parant
323fa6abba Create exception error 2020-12-18 14:30:46 +01:00
Gregoire Parant
f5dd5efc0e Manage Local Storage customers player error 2020-12-18 13:56:25 +01:00
Gregoire Parant
89064d23f9 Fix style 2020-12-18 00:09:07 +01:00
David Négrier
0984e7eaad Fix linting 2020-12-17 22:35:38 +01:00
Gregoire Parant
ed214f2b41 Fix style menu 2020-12-17 22:10:36 +01:00
Gregoire Parant
ed8232b0f5 Fix style menu 2020-12-17 21:58:18 +01:00
Gregoire Parant
e77eb6d5be Typo fixes 2020-12-17 18:19:47 +01:00
Gregoire Parant
ca1cd388e8 Fix lint 2020-12-17 16:39:11 +01:00
Gregoire Parant
08ce954f56 Add new click event to close co website 2020-12-17 16:36:01 +01:00
David Négrier
055131ac66 Typo fixes 2020-12-17 15:20:42 +01:00
Gregoire Parant
faf32bfa01 Fix event click listner 2020-12-17 14:16:10 +01:00
Gregoire Parant
2d4193a917 Merge branch 'develop' into notifOutSound 2020-12-17 13:56:21 +01:00
kharhamel
9fbcf0dc12 FIX: spark button open in a new window 2020-12-16 19:02:10 +01:00
Gregoire Parant
6a21436c9e Update menu 2020-12-16 18:56:02 +01:00
Gregoire Parant
a2d56ef56a Update admin menu 2020-12-16 18:52:11 +01:00
Gregoire Parant
1a27b7d2ee Update menu 2020-12-16 17:17:31 +01:00
Gregoire Parant
af89965db8 Fix style button 2020-12-16 16:32:28 +01:00
Kharhamel
c93d1794b7
Merge pull request #496 from thecodingmachine/fixSkinChangeCrash
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
2020-12-16 15:25:36 +01:00
Gregoire Parant
8bf72e1ffd Change out notification sound 2020-12-16 15:10:46 +01:00
kharhamel
eb88db92be FIX: going back a 2nd time to SelectCharacterScene used to crash the game 2020-12-16 15:09:58 +01:00
Kharhamel
1f3c738cd0
Merge pull request #491 from thecodingmachine/updateStyleCss
update pointer style
2020-12-16 12:58:37 +01:00
kharhamel
f5e77ad749 FIX: menu flicker 2020-12-16 12:49:34 +01:00
kharhamel
de9d6756b4 FIX: going to loginScene or customizeScene and then clicking next bring you back directly to the gameScene 2020-12-15 18:00:04 +01:00
Gregoire Parant
bb8980e1d2 update pointer style 2020-12-15 17:34:47 +01:00
Gregoire Parant
8947e1b781 update pointer style 2020-12-15 17:31:55 +01:00
kharhamel
069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
David Négrier
855b55903b
Merge pull request #440 from psy/develop
center spawn position in the middle of a tile
2020-12-11 17:36:10 +01:00
David Négrier
708790c570
Merge pull request #482 from thecodingmachine/dependabot/npm_and_yarn/front/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /front
2020-12-11 16:57:23 +01:00
kharhamel
a1aedaa594 FEAT: now play a sound when a user quit the webrtc group 2020-12-11 16:01:31 +01:00
dependabot[bot]
37fba17c20
Bump ini from 1.3.5 to 1.3.7 in /front
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:44 +00:00
David Négrier
2122014947 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2020-12-11 13:06:10 +01:00
David Négrier
6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
#	back/src/Services/SocketManager.ts
#	deeployer.libsonnet
#	docker-compose.yaml
#	front/src/Connexion/RoomConnection.ts
#	front/src/Enum/EnvironmentVariable.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/webpack.config.js
#	pusher/src/Controller/IoSocketController.ts
2020-12-11 13:00:11 +01:00
David Négrier
bf797085e6 Extracting FileController into a Uploader container 2020-12-09 21:29:29 +01:00
Kharhamel
57a59cba8e
Merge pull request #473 from thecodingmachine/master
hotfixes from master
2020-12-03 18:48:43 +01:00
David Négrier
a19edd4dc1 Fixing reconnection to server on back failure 2020-12-03 16:39:44 +01:00
Kharhamel
95665a28d5
Merge pull request #456 from thecodingmachine/performance
Performance settings
2020-12-03 14:33:12 +01:00
kharhamel
1971d26dc0 FIX: couldn't access to an anonymous private map 2020-12-01 19:34:36 +01:00
Kharhamel
5f372e485d
Merge pull request #468 from thecodingmachine/master
hotfixes from master
2020-11-30 13:49:35 +01:00
kharhamel
28b0229c76 FIX: disabled pingCameraStatus and reduced the amount of errors thrown in console 2020-11-27 17:06:47 +01:00
Gregoire Parant
27634a61ee Create menu to set your quality video and game 2020-11-27 16:24:07 +01:00
Gregoire Parant
26b81cc788 Decrease fps 2020-11-27 12:44:32 +01:00
Gregoire Parant
961e4d3f57 Decrease fps 2020-11-27 12:13:46 +01:00
David Négrier
4c1e566a6c Adding a Pusher container as a middleware/dispatcher between front and back 2020-11-26 17:53:30 +01:00
Kharhamel
17e633ae45
Merge pull request #442 from cbluoss/develop
Adding more clothing options
2020-11-26 10:30:54 +01:00
kharhamel
65785240e1 FIX: room id is now pushed to the url 2020-11-25 17:17:48 +01:00
psy
f08aec28c0 use tilewidth and tileheight to center spawn position dynamically 2020-11-25 15:58:10 +01:00
Gregoire Parant
f596f613e8 Try to decrease phaser config fps 2020-11-25 01:35:42 +01:00
Gregoire Parant
4aca04d03a Try to decrease phaser config fps 2020-11-25 01:19:19 +01:00
Gregoire Parant
08d8222ed5 level up fps to decrease GPU use in the browser 2020-11-25 00:47:21 +01:00
yourcoke
8ff24c38b0
added: engelbert hose + mask 2020-11-24 20:23:20 +01:00
kharhamel
540f69267b FIX: maps/dist directory is now gitignored 2020-11-24 14:43:21 +01:00
kharhamel
8d8b879ed6 FIX: the game now uses the url hash to choose the start layer 2020-11-24 14:43:21 +01:00
kharhamel
09d6d22a5d FIX: rewrote the way scene exits are triggered 2020-11-24 14:43:21 +01:00
grégoire parant
c5af6df7fa
Merge pull request #448 from thecodingmachine/report-button
Report button discussion
2020-11-23 20:48:52 +01:00
Gregoire Parant
3d32fb90dc Add constant 2020-11-23 20:34:05 +01:00
Gregoire Parant
2812387650 Merge branch 'develop' into action-button 2020-11-23 20:08:19 +01:00
Gregoire Parant
26cfae7136 Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-23 15:46:19 +01:00
Gregoire Parant
fd3b8dda2c Fix report button on anonymous connection 2020-11-22 12:40:03 +01:00
Gregoire Parant
39cdc3fbd9 Fix trgger stream and update scene record 2020-11-21 18:47:38 +01:00
Gregoire Parant
a6876658ab Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-21 15:57:55 +01:00
yourcoke
bbd3d9efae
added: hoodies 2020-11-21 15:46:04 +01:00
Gregoire Parant
f656d2edef Update gitignore 2020-11-21 15:41:23 +01:00
Gregoire Parant
3aaeda6f80 Merge branch 'develop' into action-button
# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts
2020-11-21 15:40:24 +01:00
yourcoke
f5e41cc285
added: pride shirt 2020-11-20 15:56:58 +01:00
yourcoke
62f13f6b30
added: mate bottle accessorie 2020-11-20 11:49:08 +01:00
yourcoke
a6c8132f0a
added: tinfoil hat1 2020-11-20 10:59:22 +01:00
psy
9e835620f1 center spawn position in the middle of a tile, instead of the upper left corner 2020-11-19 13:19:56 +01:00
Gregoire Parant
1bff2addf1 Merge branch 'develop' into firefox-error-jitsi
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-17 18:54:51 +01:00
Gregoire Parant
11def280cb Merge branch 'develop' into feature-discussion 2020-11-17 18:08:53 +01:00
Gregoire Parant
0a7063a478 Add close button 2020-11-17 18:03:44 +01:00
Gregoire Parant
64d00bda56 Add function to show when message received 2020-11-17 16:46:46 +01:00
Kharhamel
eed292b707
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
2020-11-17 15:26:11 +01:00
Kharhamel
ff8ebc3912
Merge pull request #425 from thecodingmachine/fix/teleportExit
FIX: creating an exit to the current map should not cause a crash anymore
2020-11-17 15:13:04 +01:00
kharhamel
b6b76cbfaf FIX: creating an exit to the current map should not cause a crash anymore 2020-11-17 15:02:21 +01:00
Kharhamel
f70f0a58a9
Merge pull request #424 from thecodingmachine/fix/coWebsiteBlocking
FIX: more cowebsite fixes
2020-11-17 14:58:13 +01:00
kharhamel
3d8d8cc3a9 FIX: more cowebsite fixes 2020-11-16 16:15:21 +01:00
Gregoire Parant
1570ef9663 Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2020-11-16 15:46:52 +01:00
Gregoire Parant
b0bd4c5f40 Merge remote-tracking branch 'github.com/develop' into feature-discussion 2020-11-16 15:43:28 +01:00
David Négrier
c7031c7c54
Merge pull request #411 from thecodingmachine/fix-#314
Fix init position and trigger layers properties
2020-11-16 15:24:21 +01:00
Gregoire Parant
2d0fc1072f Fix feedback 2020-11-16 15:05:51 +01:00
Gregoire Parant
0fc57f3548 Change resolution 2020-11-14 14:04:11 +01:00
Kharhamel
40e9570cdc
Merge pull request #418 from thecodingmachine/fix/coWebsiteBlocking
FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes
2020-11-13 18:28:31 +01:00
kharhamel
2a6b2e0cbf FIX: the jitsi iframe promise now throw an error if it cannot load in 10 secondes 2020-11-13 18:08:43 +01:00
Gregoire Parant
733efd4a03 Add env admin url in webpack 2020-11-13 12:41:49 +01:00
Gregoire Parant
ebfe08fb92 Create new env admin url 2020-11-13 12:15:33 +01:00
Kharhamel
6c6d046891
Merge pull request #401 from kidager/qwerty-support
Add support for QWERTY keyboards
2020-11-12 10:32:58 +01:00
Kharhamel
b468f03603
Merge pull request #412 from thecodingmachine/fix/iHatePong
FIX: remove the ping and pong overrides server side
2020-11-12 10:28:02 +01:00
kharhamel
9b64a970b5 FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side 2020-11-10 18:26:46 +01:00
Gregoire Parant
73fa0ecbfc Fix init position and trigger layers properties 2020-11-10 17:00:23 +01:00
David Négrier
ed527f5e72
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts
Fix/cowebsite conflicts
2020-11-10 15:54:27 +01:00
Gregoire Parant
8412575c40 Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-10 15:27:22 +01:00
kharhamel
1080328afa FIX: cowebsite transitions are now queued to prevent conflicts 2020-11-10 15:22:30 +01:00
Gregoire Parant
b75f28d3ca Merge branch 'develop' into feature-discussion
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-11-10 15:15:24 +01:00
Gregoire Parant
142566dfde Fix error get media stream camera
Fix error camera when user have not cam on computer
2020-11-10 14:03:29 +01:00
Gregoire Parant
694f5d692f Merge branch 'develop' into windows-focus-blur-camera 2020-11-10 13:07:08 +01:00
Gregoire Parant
76014e3dc1 Merge branch 'develop' into action-button 2020-11-10 13:06:47 +01:00
Gregoire Parant
0acbe20bbf Fix name send in message 2020-11-10 13:00:14 +01:00
Gregoire Parant
3333b3cee3 Fix feedback moufmouf 2020-11-10 12:38:32 +01:00
Gregoire Parant
f837f1a31f Merge branch 'develop' into feature-discussion 2020-11-10 11:50:41 +01:00
Jacem Chaieb
c4f28a0a8d
Add support for QWERTY keyboards 2020-11-09 12:24:45 +01:00
kharhamel
760708948f FIX: close the coWebSite on network error 2020-11-09 11:16:54 +01:00
David Négrier
00b83ae349 Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera 2020-11-06 17:36:43 +01:00
Gregoire Parant
a1d3b01619 Fix typo 2020-11-04 16:30:01 +01:00
Gregoire Parant
968787555f Update feedback @moufmouf 2020-11-04 13:33:58 +01:00
Gregoire Parant
6ef2148a34 Fix feedback @moufmouf 2020-11-04 13:07:38 +01:00
Gregoire Parant
47a049ecaf Feedback comment @moufmouf 2020-11-04 12:42:33 +01:00
Gregoire Parant
6051e5f46a Fix when user have activated action button 2020-11-01 11:53:24 +01:00
Gregoire Parant
fcb7f364b6 Fix button action when user have activated 2020-11-01 11:49:09 +01:00
Gregoire Parant
74de2746c2 Create action button 2020-10-31 14:04:55 +01:00
Gregoire Parant
a2dd3bd6ab Fix style 2020-10-30 20:35:45 +01:00
Gregoire Parant
724bb7f288 Merge branch 'develop' into feature-discussion 2020-10-30 20:04:12 +01:00
Gregoire Parant
df49ea856a Fix conflict error 2020-10-27 20:51:11 +01:00
Gregoire Parant
80355e6b85 fix layout mode click when discussion is activated 2020-10-27 20:46:53 +01:00
Gregoire Parant
55c1bcee66 Add callback report in discussion part 2020-10-27 20:18:25 +01:00
Kharhamel
dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:57:56 +01:00
kharhamel
67aa2f4b6c opening and closing jitsi windows now trigger some transitions 2020-10-27 17:44:57 +01:00
Gregoire Parant
855f42a12e Merge remote-tracking branch 'github.com/develop' into windows-focus-blur-camera
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2020-10-26 22:43:14 +01:00
Gregoire Parant
997acd17ad Update to use update function scene 2020-10-26 22:39:52 +01:00
Kharhamel
11541f9f55
Merge pull request #378 from thecodingmachine/jitsiQOL
disabling audio/video in jitsi carry over to wa
2020-10-26 17:05:39 +01:00
kharhamel
65a710d1f4 disabling audio/video in jitsi carry over to wa 2020-10-26 16:55:56 +01:00
Gregoire Parant
f95f38b092 Permit to remove callback 2020-10-26 14:13:51 +01:00
Gregoire Parant
850be63284 Fix style 2020-10-26 00:26:10 +01:00
Gregoire Parant
1e096af43b Fix font family 2020-10-26 00:03:30 +01:00
Gregoire Parant
bdb504722f Fix style -webkit-focus 2020-10-25 22:41:31 +01:00
Gregoire Parant
1945c24704 Create send data discussion 2020-10-25 21:59:14 +01:00
Gregoire Parant
f344adc48b Create discussion
- Add new discussion class
- Feature to discuss and report user
2020-10-25 19:39:15 +01:00
Gregoire Parant
b6fe9e72e1 Fix style and refactor 2020-10-25 19:38:00 +01:00
Gregoire Parant
69f3e511ab Ping status camera and microphone 2020-10-24 14:40:51 +02:00
Gregoire Parant
199ed1266a Switch off camera when user is not focused on WorkAdventure windows
Feature to switch off camera when user is not focused on WorkAdventure windows after 10 seconds
2020-10-24 14:13:23 +02:00
Gregoire Parant
e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
kharhamel
00ad28f084 feat: jitsi no start with audio or video muted when needed 2020-10-23 17:19:20 +02:00
kharhamel
3fdca94afb refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager 2020-10-23 17:19:14 +02:00
Gregoire Parant
cfb6ad581e Fix red circle created 2020-10-21 23:08:05 +02:00
Gregoire Parant
e973921390 Fix admin tags
- Fix get size group
- Fix admin tags
- Fix texture already used
2020-10-21 17:22:17 +02:00
Gregoire Parant
1df4cb3e17 Red circle when have 4 users during webrtc meet 2020-10-21 16:07:42 +02:00
David Négrier
9ec5dc093c Improving benchmark 2020-10-21 14:55:18 +02:00
David Négrier
54fd429952
Merge pull request #351 from thecodingmachine/screan-sharing-peer-connection-fix
Fix sharing peer connection
2020-10-21 12:22:31 +02:00
David Négrier
45c6e13cad Fixing loading of same custom texture several time
Phaser 3 does not trigger oncomplete event if the resource is already loaded.
2020-10-21 10:34:55 +02:00
Gregoire Parant
2ee6d43274 Fix sharing peer connection 2020-10-20 20:39:33 +02:00
David Négrier
c03dd4c551 Jitsi room names don't have / 2020-10-20 19:47:28 +02:00
David Négrier
cfed5b3053
Merge pull request #348 from thecodingmachine/screen-sharing-fix
Fix screen sharing
2020-10-20 18:31:31 +02:00
Gregoire Parant
7fa999a1bd Fix lint 2020-10-20 18:03:10 +02:00
Gregoire Parant
173f7a5061 Fix webrct finish event delay 2020-10-20 18:02:44 +02:00
David Négrier
78a4bf3189 Adding custom character textures 2020-10-20 17:42:36 +02:00
David Négrier
a3816cd725
Merge pull request #346 from thecodingmachine/customUserStore
improved the local storage of the the selectcharacterScene
2020-10-20 17:38:54 +02:00
arp
dff189b223 local storage of the custom layers 2020-10-20 17:25:08 +02:00
Gregoire Parant
336742b8b3 Fix screen sharing
Foce screan sharing to create new peer connexion and share it
2020-10-20 14:48:59 +02:00
arp
f5aa70ddc2 improved the local storage of the the selectcharacterScene 2020-10-20 13:44:57 +02:00
Gregoire Parant
fef6786697 Fix typo 2020-10-20 11:27:11 +02:00
Gregoire Parant
3325cdf970 Update banned message modal 2020-10-20 11:25:17 +02:00
Gregoire Parant
8d1d6fc8dc Push message when user is connected on new room 2020-10-20 09:20:00 +02:00
Gregoire Parant
7059c6e6e3 Refactor message 2020-10-20 08:20:21 +02:00
Gregoire Parant
ba9f9dcbe1 Fix CD 2020-10-19 21:04:16 +02:00
Gregoire Parant
bf9dfcc835 Ban mesage
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
2020-10-19 19:32:47 +02:00
arp
75d9ed8dfa implemented the admin websocket
now send data
2020-10-19 14:23:50 +02:00
David Négrier
bf01116f63 Removing useless features of Jitsi meet 2020-10-19 12:36:05 +02:00
David Négrier
16d1c2354e Adding fallback to unauthenticated Jitsi 2020-10-19 11:07:49 +02:00
David Négrier
260b0ea408 Adding JWT authentication to Jitsi 2020-10-16 19:23:28 +02:00
David Négrier
c259dd582c Fixing change of map with relative URLs 2020-10-16 09:29:18 +02:00
David Négrier
c75f1edc40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report
# Conflicts:
#	back/src/Controller/AuthenticateController.ts
2020-10-15 18:01:44 +02:00
David Négrier
c59a335a1a Removing useless resource 2020-10-15 18:00:34 +02:00
David Négrier
267476c651 Removing TODO 2020-10-15 17:59:32 +02:00
David Négrier
0ea7240834 Adding condition to enable reporting only on private rooms 2020-10-15 17:58:27 +02:00
David Négrier
e7890907c1
Merge pull request #331 from thecodingmachine/verifyjwtserverside
Adding a new endpoint to verify the JWT token server-side before connecting
2020-10-15 17:02:41 +02:00
David Négrier
a348001036 Adding a new endpoint to verify the JWT token server-side before connecting 2020-10-15 16:48:42 +02:00
David Négrier
702084b00a
Merge pull request #330 from thecodingmachine/exiturl
Adding exitUrl property
2020-10-15 16:00:50 +02:00
David Négrier
2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory
Fixing URL not being rewritten when changing maps
2020-10-15 15:52:01 +02:00
David Négrier
36d73333f5 Adding exitUrl property
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
2020-10-15 15:50:51 +02:00
David Négrier
517b3a644b Fixing URL not being rewritten when changing maps 2020-10-15 14:35:09 +02:00
arp
67a9bd2520 improved textField component and allowed 8 caracter names 2020-10-15 14:23:39 +02:00
Gregoire Parant
62dfb68aaf Update style report modal 2020-10-15 12:24:16 +02:00
Gregoire Parant
38d2cc9a8c Remove teleport feature 2020-10-15 12:12:11 +02:00
Gregoire Parant
8df56204e3 Add teleport event 2020-10-15 11:51:24 +02:00
Gregoire Parant
4799460064 Merge branch 'develop' into player-report
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
David Négrier
807ccc49d4 Fixing rewriterule with register link in prod 2020-10-14 13:52:02 +02:00
David Négrier
b7340022de Fixing rewriterule with @ in prod 2020-10-14 13:29:16 +02:00
David Négrier
731ccd8796 Fix CI 2020-10-14 11:48:34 +02:00
David Négrier
98bda49d7e Get tags from the admin
And uses tag "admin" to choose whether to display the console or not
2020-10-14 11:07:34 +02:00
David Négrier
ce93e5bbaa Fixing the way rights are sent to the admin (now sending organization/world/room) 2020-10-14 10:37:00 +02:00
Gregoire Parant
436cde7033 Fixe style media manager and text modale 2020-10-13 21:54:08 +02:00
Gregoire Parant
047fa7b594 Merge branch 'player-report-fix-conflict' into player-report
# Conflicts:
#	back/src/Controller/IoSocketController.ts
2020-10-13 21:16:57 +02:00
Gregoire Parant
9c44d37020 Merge remote-tracking branch 'github.com/develop' into player-report
# Conflicts:
#	back/src/Controller/IoSocketController.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
#	messages/messages.proto
2020-10-13 21:14:46 +02:00
Gregoire Parant
05a1ea8469 Merge branch 'develop' into player-report
# Conflicts:
#	back/src/Controller/IoSocketController.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
#	messages/messages.proto
2020-10-13 20:39:29 +02:00
Gregoire Parant
dbaf44e814 Change report flag
- Add icon on video
- Permit to have a modal with comment
2020-10-13 19:56:42 +02:00
David Négrier
cb159350e9 Fixed room switching 2020-10-13 18:44:50 +02:00
David Négrier
a2c750dea2 Fix linter 2020-10-13 17:30:53 +02:00
David Négrier
45a2721c5c Fixing code post rebase 2020-10-13 17:20:20 +02:00
David Négrier
ec93891c6b Using Room class to load GameScene 2020-10-13 17:10:07 +02:00
David Négrier
aee06da7f9 Refactoring Room.ts to fetch map url automatically from ID 2020-10-13 17:10:07 +02:00
arp
ccf80c1dd0 added an edge case for the default map url 2020-10-13 16:47:15 +02:00
arp
d98efc0433 lint fixes 2020-10-13 16:23:49 +02:00
Gregoire Parant
65406f844e Teleport notification
- Create end point to permit the teleport notification. The map url will be /teleport/token_user
- Create message teleport
- Create receive feature in phaser to teleport

TODO
Teleport player on black room.
2020-10-13 11:39:07 +02:00
David Négrier
9a04836215 Dynamically import Quill
We load Quill only if it is needed (after all, only admins need Quill)
2020-10-13 10:26:27 +02:00
David Négrier
0731bd39e5 Moving back to using ScenePlugin and adding EntryScene 2020-10-12 18:59:49 +02:00
David Négrier
2852f204f5 Improving error handling upon unknown URL 2020-10-12 17:42:37 +02:00
arp
02c193a262 rewrote the authorisation flow: give more responsability to gameManager and less to gameScene 2020-10-12 16:45:09 +02:00
Gregoire Parant
aeced0c648 create message to report 2020-10-12 11:22:41 +02:00
arp
032facb75f lint fixes 2020-10-09 17:21:46 +02:00
arp
f550c5a775 merge from develop 2020-10-09 17:10:24 +02:00
arp
c5f8b43fec more fixes 2020-10-09 17:01:34 +02:00
Gregoire Parant
07c17452e7 Merge branch 'develop' into player-report 2020-10-09 16:15:15 +02:00
arp
5e54fc2c26 some fixes 2020-10-09 14:53:18 +02:00
arp
4af46b1b3f simplified mapUrl parsing 2020-10-08 18:51:24 +02:00
David Négrier
120804e774
Merge pull request #293 from thecodingmachine/responsive_scenes
Making scenes responsive
2020-10-08 17:53:54 +02:00
David Négrier
386b25afa0 Switching customizeScene and gameScene to new ResizableScene 2020-10-08 16:00:29 +02:00
David Négrier
66f3345861 Adding responsive to SelectCharacterScene 2020-10-08 15:10:46 +02:00
arp
5ac2083995 updated quill in front to 1.3.7 2020-10-08 11:48:49 +02:00
David Négrier
79b5c5de93 Making login scene responsive 2020-10-07 18:03:34 +02:00
Gregoire Parant
c63fb6ed6f Add image to report and to teleport player 2020-10-06 23:56:27 +02:00
David Négrier
f542b117a8 Refactoring connection to pass room info on connect 2020-10-06 18:11:42 +02:00
David Négrier
1061c80f1f Fixing connection closing 2020-10-01 17:16:49 +02:00
David Négrier
e1193ad95a Fixing console removal 2020-10-01 17:16:36 +02:00
David Négrier
8bc5832eac Removing warning on startup 2020-10-01 17:15:33 +02:00
David Négrier
9563013f48 Removing useless file 2020-10-01 16:02:45 +02:00
David Négrier
d3fa901691 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message
+ migrating to protobuf messages

# Conflicts:
#	back/src/App.ts
#	back/src/Controller/IoSocketController.ts
#	back/yarn.lock
#	front/src/Connection.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Login/EnableCameraScene.ts
#	front/src/WebRtc/SimplePeer.ts
2020-10-01 14:11:34 +02:00
David Négrier
57262de1bf Fixing CI + lowering extrapolation time 2020-09-30 13:49:23 +02:00
David Négrier
074398c4e0 Fixing benchmark initialization 2020-09-30 12:12:24 +02:00
David Négrier
53c6c2bc30 Fixing benchmark 2020-09-29 17:24:16 +02:00
David Négrier
9f3577286d Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws
# Conflicts:
#	back/src/Controller/AdminController.ts
#	back/src/Controller/AuthenticateController.ts
#	back/src/Controller/IoSocketController.ts
#	back/src/Controller/MapController.ts
#	benchmark/index.ts
#	front/src/Connexion/RoomConnection.ts
2020-09-29 17:12:28 +02:00
David Négrier
432b4a0e85 Linting app 2020-09-29 16:12:17 +02:00
David Négrier
b485c9bf46 Switching WebRTC to protobuf + uws 2020-09-29 16:01:22 +02:00
David Négrier
6a4c0c8678 Migrating to uWS 2020-09-28 18:52:54 +02:00
arp
3f9659ef3c improvments 2020-09-28 15:40:34 +02:00
arp
af4611ed29 rewrote the login workflow 2020-09-25 19:23:33 +02:00
David Négrier
ac80850335 Switching SetViewport to protobuf 2020-09-24 17:36:10 +02:00
David Négrier
24a6cd7f8e Switched ITEM_EVENT to protobuf 2020-09-24 17:24:37 +02:00
David Négrier
cd083a2090 Merge branch 'develop' of github.com:thecodingmachine/workadventure into protobuf
# Conflicts:
#	back/package.json
2020-09-24 16:22:16 +02:00
David Négrier
0c4c43f88c Adding USER_LEFT message to protobuf 2020-09-24 16:11:47 +02:00
David Négrier
2dad601311 Adding JOIN_ROOM message in protobuf 2020-09-24 14:50:28 +02:00
David Négrier
d7209d8864 Migrating messages locally into back and front 2020-09-24 11:16:08 +02:00
David Négrier
b4f971c501 Switched group position to protobuf 2020-09-24 10:05:16 +02:00
Gregoire Parant
7f4014cccf Fix CI 2020-09-23 19:07:45 +02:00
Gregoire Parant
7584c3a04d Fix CI 2020-09-23 18:44:24 +02:00
Gregoire Parant
3cb079c80c Fix CI 2020-09-23 18:37:54 +02:00
Gregoire Parant
d5fdb9d857 Fix style 2020-09-23 18:07:31 +02:00
Gregoire Parant
bcb126a146 Merge branch 'develop' into feature/global-message
# Conflicts:
#	back/src/App.ts
2020-09-23 17:26:00 +02:00
Gregoire Parant
942d2cbcef Refactor and remove prevent default keyboard 2020-09-23 17:22:00 +02:00
Gregoire Parant
8c43c67741 Create feature to send and read audio message 2020-09-21 15:00:39 +02:00
David Négrier
76d3779438 Moved GroupUpdateMessage to protobuf 2020-09-21 11:24:03 +02:00
arp
a19f09bef2 improve the register workflow 2020-09-21 10:51:48 +02:00
Gregoire Parant
16b3e48711 Add menu to switch 2020-09-21 01:16:10 +02:00
Gregoire Parant
1829912c91 Fix remove last childnode 2020-09-21 00:42:39 +02:00
Gregoire Parant
e0ae79eaf1 Fini quill box 2020-09-21 00:34:25 +02:00
Gregoire Parant
9b955ebd20 fix style quill box 2020-09-20 19:31:24 +02:00
Gregoire Parant
844bffa988 Create file controller to upload audio document 2020-09-20 19:01:21 +02:00
Gregoire Parant
45ad4bbb36 Send and play audio message 2020-09-20 17:12:27 +02:00
Gregoire Parant
4c7e458e52 create event and brodcast event in backend 2020-09-19 01:08:56 +02:00
David Négrier
b148ca3708 Linting 2020-09-18 18:16:26 +02:00
David Négrier
d2a5060ad2 Using multistage builds with protocol buffers 2020-09-18 18:00:03 +02:00
David Négrier
d3116c7400 Building proto messages in CI 2020-09-18 17:51:12 +02:00
David Négrier
5c0a4e7c5a Fixing front Dockerfile 2020-09-18 17:39:59 +02:00
David Négrier
7826b2ea8d Fixing Docker build images to add new messages directory 2020-09-18 17:22:45 +02:00
David Négrier
df0636c513 Migrating user position messages to protobuf 2020-09-18 15:51:15 +02:00
David Négrier
e9ca8721a6 Migrating userId to "int32" to save some space and adding userMoves message in protobuf 2020-09-18 13:57:38 +02:00
arp
ed9552b62b added a register route via token 2020-09-17 18:21:49 +02:00
David Négrier
4b55b54a07 Adding first protobuf message exchange 2020-09-17 17:14:47 +02:00
Gregoire Parant
e59cbcfaa7 Create console global message
- Add style
- Create zone and button to show the admin console
2020-09-16 21:50:04 +02:00
Gregoire Parant
509196785b Initialise global message
- Create new class to manager global message. My idea is that this class permit to manage audio or text message.
 - Update html to have main content id and inject html in this.
 - Create front event to receive startMessage and stopMessage.
 - Delete impoted variable not used.
2020-09-16 18:38:50 +02:00
David Négrier
f5f9dcac04 Making groups part of zones 2020-09-16 16:06:43 +02:00
David Négrier
3a9196fb82 Merge 2020-09-16 11:41:03 +02:00
David Négrier
d24ec0bd75 Plugin PositionNotifier into the main application. 2020-09-15 16:21:41 +02:00
David Négrier
f8d462b0d7 Fixing "any" type 2020-09-15 10:10:35 +02:00
David Négrier
9b702c75e3 Adding batched messages + the notion of notifier / zones (not plugged in the system yet) 2020-09-15 10:06:11 +02:00
David Négrier
e418e8fd09 Setting the depth of the chat mode / presentation mode to 99999 to avoid melting buttons with map. 2020-09-10 09:31:53 +02:00
David Négrier
f70ba1411a Hiding cam details when entering a Jisti room 2020-09-01 14:43:21 +02:00
David Négrier
9516f6615c Centering character based on game div
Previously, character was centered based on window size, but when doing CoWebsite browsing, window size != game size, leading to poorly centered characters
2020-08-31 17:56:11 +02:00
David Négrier
8655aef629 Fixing URL passing in WebRtc setup 2020-08-31 15:34:21 +02:00
David Négrier
3875c0afe8 Fixing environment variable passing in Webpack 2020-08-31 15:34:21 +02:00
David Négrier
ed116cf2a3 Switching on our very own turn server 2020-08-31 15:33:50 +02:00
David Négrier
6f6873e870
Merge pull request #251 from thecodingmachine/fix_camera_stop
Camera was not properly closed in EnableCameraScene
2020-08-31 15:31:33 +02:00
David Négrier
634eecd42a Fixing issue when both mic and cam are stopped 2020-08-31 15:21:05 +02:00
David Négrier
c739037bc4 Camera was not properly closed in EnableCameraScene 2020-08-31 14:54:52 +02:00
David Négrier
9351719873 Adding the notion of silent zone 2020-08-31 14:10:01 +02:00
David Négrier
df7b5cc2e3 Adding a "silent" notion (triggered in Jitsi meets) 2020-08-31 14:03:40 +02:00
David Négrier
0a8ba37049 Adding Jitsi meet support 2020-08-31 12:18:00 +02:00
David Négrier
a128ff117b code style 2020-08-30 17:40:04 +02:00
David Négrier
01319b50ca Adding a "openWebsite" property that opens websites when we walk over the zone. 2020-08-30 17:37:38 +02:00
David Négrier
168697eb46 Adding a GameMap class that helps tracking when the properties of the tiles the user is changes (when the user moves) 2020-08-30 15:44:22 +02:00
David Négrier
13272968cf Clicking on a video puts it in presentation mode
Adding the ability to put a video in presentation mode by clicking on it.
Also, adding small CSS animations on hover.
2020-08-27 10:16:34 +02:00
David Négrier
7dc9e32b84 Merge branch 'screenshare2' into outline 2020-08-24 18:24:47 +02:00
David Négrier
7f5f802b86 Avoiding flickering when entering presentation mode with no presentation 2020-08-24 18:23:02 +02:00
David Négrier
fca93663b4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline 2020-08-24 18:15:44 +02:00
David Négrier
044495cf05 Centering character in free space
This commit adds the ability to put the character where there is free space when a discussion is hapening (either in presentation or chat mode)
2020-08-24 14:19:36 +02:00
David Négrier
b7c2f8be7b Adding colors for cam/mic/screen share button
Microphone and camera are now red when disabled.
Screen-share is green when enabled.
Also, they are now always partially visible (they were completely hidden previously until hovering in the lower right corner)
2020-08-22 15:26:40 +02:00
David Négrier
91f422d0c3 Fixing stop of stream in bi-directional screen sharing. 2020-08-21 22:53:17 +02:00
David Négrier
f60b02f1dc Putting a wider onhover surface when clicking on one of the buttons to manage screen sharing or video/mic 2020-08-20 22:57:34 +02:00
David Négrier
c442d6ce67 Lint 2020-08-20 22:29:14 +02:00
David Négrier
dc36af19bc Detecting press on "stop screen sharing" 2020-08-20 22:23:38 +02:00
David Négrier
1162439479 Overloading destroy method instead of having a separate method to remove video. 2020-08-20 22:23:22 +02:00
David Négrier
27ffb6b13d Refactoring SimplePeer code: splitting Peer instantiation into 2 subclasses (VideoPeer and ScreenSharingPeer). This leads to way leaner code. 2020-08-20 16:56:10 +02:00
David Négrier
894f7c8009 Removing useless roomID parameter in WebRtcSignal message 2020-08-20 15:21:07 +02:00
David Négrier
0119534283 First version of screen-sharing that works when a user is joining a group after screen sharing begun. 2020-08-20 00:05:00 +02:00
David Négrier
cc1cb2f671 Fixing linting 2020-08-18 14:59:50 +02:00
David Négrier
2e61c2ef62 Getting back code in compilable fashion after huge rebase 2020-08-18 00:12:38 +02:00
Gregoire Parant
4b72958193 Fix peer connexion for two player with screen sharing 2020-08-17 23:56:46 +02:00
Gregoire Parant
a8f27e6084 Create event to start webrtc screen charing 2020-08-17 23:54:26 +02:00
Gregoire Parant
a4f42111d7 Update screen sharing feature 2020-08-17 23:47:17 +02:00
Gregoire Parant
0bbed7717a Continue screen sharing 2020-08-17 23:39:50 +02:00
Gregoire Parant
3e2c5049f2 Fix to add special screen sharing 2020-08-17 23:36:02 +02:00
Gregoire Parant
209057e3fc New fictive user screen sharing
- Create new fictive user
 - Add new fictive user in WebRtc group
 - Add screen sharing video on left side
2020-08-17 23:32:39 +02:00
Gregoire Parant
6c1b8122ef Fix CI 2020-08-17 23:19:31 +02:00
Gregoire Parant
eed5333d69 Stability simple peer 2020-08-17 23:18:38 +02:00
Gregoire Parant
208b91e52a Feature screen sharing
- Send stream of screen sharing in peer connexion
 - Add button for share your screen
2020-08-17 23:17:00 +02:00
David Négrier
6b970adc6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Player/Player.ts
#	front/src/index.ts
#	front/yarn.lock
2020-08-17 22:51:37 +02:00
David Négrier
fc78249eae Code cleanup 2020-08-17 22:03:08 +02:00
David Négrier
0f305b0c12 CSS cleanup 2020-08-17 21:59:26 +02:00
David Négrier
beb0d1ef0a Linter fix 2020-08-17 16:18:39 +02:00
David Négrier
6516e621b0 Adding display / hide of layout buttons when a meet start / ends 2020-08-17 16:12:53 +02:00
David Négrier
7fe2cc19c3 Adding buttons to switch mode 2020-08-17 15:20:03 +02:00
David Négrier
05ca8c813e Fixing chat mode canceling flex display 2020-08-16 23:49:31 +02:00
David Négrier
1509777945 Improving video CSS (work on overlay) 2020-08-16 23:45:03 +02:00