Commit Graph

1685 Commits

Author SHA1 Message Date
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
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
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
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
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
Johannes Berthel
80a5d2e30e added random companion to player 2021-04-01 00:33:05 +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