noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,631 Commits 1 Branch 0 Tags 26 MiB
1a4f178728
Commit Graph

1631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Négrier
1a4f178728
Update front/src/Phaser/Menu/MenuScene.ts 2021-04-14 15:57:57 +02:00
Gregoire Parant
ba8d3020eb Merge branch 'master' into HotFixForm 2021-04-13 12:33:04 +02:00
grégoire parant
f5f4ee229b
Merge pull request #895 from thecodingmachine/hotFixKeyUp 
HotFix
 2021-04-13 12:32:18 +02:00
Gregoire Parant
4119f69879 HotFix 
- Key up m when user write message
 - Size game share
 2021-04-13 12:30:15 +02:00
Gregoire Parant
270cdb5c82 Button "CREATE MAP" must redirect user on production server 2021-04-12 20:44:29 +02:00
Gregoire Parant
1693819b6a HotFix Share Form height 2021-04-12 20:23:00 +02:00
grégoire parant
2a6221afe2
Merge pull request #889 from thecodingmachine/HotFixStyle 
HotFix style WorkAdventure
 2021-04-12 19:30:06 +02:00
Gregoire Parant
6a08ca656f Add TODO 2021-04-12 18:26:36 +02:00
Gregoire Parant
4fc9a12b95 HotFix style WorkAdventure 2021-04-12 18:17:04 +02:00
David Négrier
5ad7787cd5
Merge pull request #887 from thecodingmachine/develop 
Deploy 2021-04-11
 2021-04-11 21:31:54 +02:00
David Négrier
34a0fc5014
Merge pull request #886 from thecodingmachine/npm_package_for_iframe_api_typings 
Allowing loading HTTP local resources from a HTTPS endpoint.
 2021-04-11 21:25:42 +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
David Négrier
5beefcd274
Merge pull request #885 from thecodingmachine/npm_package_for_iframe_api_typings 
Creating a dedicated package for iframe API typings
 2021-04-11 11:38:50 +02:00
David Négrier
728fd4779c Dynamically fetching correct version and generating declarations only for npm lib 2021-04-11 11:32:56 +02:00
David Négrier
0f7ac7ba8b Added empty .npmignore to override .gitignore 2021-04-10 19:14:36 +02:00
David Négrier
6acf0ff047 Creating a dedicated package for iframe API typings 
If users are willing to use Typescript to develop scripts for maps, they will need typings for the `WA` object.
This commit creates a new package (@workadventure/iframe-api-typings) that contains only the `iframe_api.d.ts` file.

The file is generated from the build of the front and isolated in this package.
This is necessary because the iframe_api.js file is supposed to always be loaded from WorkAdventure directly (and there is no @workadventure/iframe-api package and there will never be one)
 2021-04-10 18:50:46 +02:00
David Négrier
a1f06ffbd5
Merge pull request #883 from ClementVieilly75/FTUEPopup 
Ftue popup
 2021-04-09 17:41:39 +02:00
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup 2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
8720354c87 exit Url changed : tcm/workadventure/floor0 2021-04-09 16:39:37 +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
d52c983ab9 Merge branch 'FTUEPopup' of https://github.com/ClementVieilly75/workadventure into FTUEPopup 2021-04-09 14:35:20 +02:00
DESKTOP-FMM8UI0\CLV
46cc7b3b3b add pannels 2021-04-09 14:35:15 +02:00
David Négrier
f77a02f0cd
Merge pull request #881 from thecodingmachine/develop 
Deploy 2021-04-08
 2021-04-08 21:52:25 +02:00
David Négrier
fb6a529e4a
Merge pull request #879 from ClementVieilly75/FTUEPopup 
map village + popUp go to page
 2021-04-08 12:02:50 +02:00
David Négrier
34e89fa63e
Update maps/Village/scriptMapVillage.js 2021-04-08 12:02:14 +02:00
DESKTOP-FMM8UI0\CLV
0f4034854c Add closePopup function 2021-04-08 10:50:41 +02:00
DESKTOP-FMM8UI0\CLV
eb66ab3fdd Supp arrow white 2021-04-08 10:17:52 +02:00
DESKTOP-FMM8UI0\CLV
af69510bc8 Modif popup positions and add arrow 2021-04-08 09:41:53 +02:00
David Négrier
aac8cc8d67
Merge pull request #848 from thecodingmachine/develop 
Deploy 2021-03-29
 2021-04-07 15:24:13 +02:00
DESKTOP-FMM8UI0\CLV
39074511a4 map village + popUp go to page 2021-04-07 13:06:30 +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
Kharhamel
6e7b1f3ef6
Merge pull request #867 from thecodingmachine/roomEdition 
FEATURE: editing a room in the admin trigger a refresh system
 2021-04-02 15:29:39 +02:00
kharhamel
88cc15cd02 FEATURE: editing a room in the admin trigger a refresh system 2021-04-02 15:22:02 +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
David Négrier
9235809d53
Merge pull request #866 from thecodingmachine/dependabot/npm_and_yarn/pusher/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2 in /pusher
 2021-04-01 08:59:40 +02:00
dependabot[bot]
f18562577e
Bump y18n from 3.2.1 to 3.2.2 in /pusher 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [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-31 18:46:01 +00:00
Kharhamel
512c370f3f
Merge pull request #865 from thecodingmachine/cowebsiteControls 
FEATURE: improved the fullscreen and close buttons
 2021-03-31 18:45:49 +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
651dfc63f4 Fixing TURN server config 2021-03-31 16:38:30 +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
9bfd07f00c Merge branch 'develop' of github.com:thecodingmachine/workadventure into singledomain 2021-03-31 15:17:29 +02:00
Mewp
6f1fc08b82 Add a docker-compose file for hosting under a single domain. 2021-03-31 12:11:00 +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
David Négrier
189e4313ea
Merge pull request #859 from thecodingmachine/dependabot/npm_and_yarn/back/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2 in /back
 2021-03-31 09:25:02 +02:00
David Négrier
9768055946
Merge pull request #858 from thecodingmachine/dependabot/npm_and_yarn/messages/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2 in /messages
 2021-03-31 09:24:51 +02:00