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
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
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
_Bastler
5afd17a5d6
hotfix ssl proxy
2021-04-11 10:03:38 +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
_Bastler
36d9907a09
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-04-09 18:40:41 +02:00
Johannes Berthel
8d4e0c3e88
added companion compatibility with phaser 3.54.0
2021-04-09 18:30:30 +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
Johannes Berthel
32784d6775
Merge branch 'develop' into feature/player-companion
2021-04-08 23:37:36 +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
Johannes Berthel
73e515c236
don't show companion scene after first refresh
2021-04-08 18:42:05 +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
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
_Bastler
c2a765cb0d
fix API_URL
2021-04-06 10:30:26 +02:00
_Bastler
052da2281d
merge develop
2021-04-06 10:24:46 +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
