Commit graph

790 commits

Author SHA1 Message Date
Kharhamel 8cdf572685
Merge pull request #870 from joberthel/feature/player-companion
Added companion (pet) to player
2021-04-12 18:11:07 +02:00
Kharhamel 29d43d7776
Merge pull request #878 from thecodingmachine/localStorageGhost
FIX: improved the validation from localstorage for username and characterLayers
2021-04-12 14:56:51 +02:00
kharhamel 8e467f3e10 FIX: improved the validation from localstorage for username and characterLayers 2021-04-12 14:48:00 +02:00
David Négrier 3dd2a634a0 Allowing loading HTTP local resources from a HTTPS endpoint.
By default, maps are loaded in HTTPS if WorkAdventure is running in HTTPS, and in HTTP is WorkAdventure is running in HTTP.
Also, if WorkAdventure is running in HTTP and map loading fails, we try map loading in HTTPS (useful when we are working on WorkAdventure locally and want to load a map on a secure domain).

This commit adds the last combination: If WorkAdventure is running in HTTPS, and map loading fails in HTTPS **AND** if the map URL is targetting "localhost", "*.localhost" or "127.0.0.1", then we attempt to load the resource in HTTP.

Why?

"localhost" is considered secure context by modern browsers. So even if a page is loaded in HTTPS, it can load resources from any secure context (including localhost in HTTP).

This means that from "https://play.workadventu.re", I can now test a map running locally on my machine (served by a classic webserver without any certificate).
This change should make map testing easier, since map developers will not have to install the whole WorkAdventure project to test their map locally.
2021-04-11 14:56:03 +02:00
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
Johannes Berthel 80a5d2e30e added random companion to player 2021-04-01 00:33:05 +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 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
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
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