Commit Graph

1588 Commits

Author SHA1 Message Date
Johannes Berthel
2ad712807b add companion only on local player 2021-04-02 17:14:34 +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
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
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
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
dependabot[bot]
b63ad7ceb7
Bump y18n from 3.2.1 to 3.2.2 in /back
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-30 14:32:38 +00:00
dependabot[bot]
92439b5899
Bump y18n from 3.2.1 to 3.2.2 in /messages
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-30 14:32:34 +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
ad4f8e892e
Merge pull request #852 from joberthel/fix-starting-position
use map tilewidth to calculate starting position instead of hardcoded value
2021-03-28 17:50:28 +02:00
David Négrier
ccb80317ee Changing exit URL of Tuto map 2021-03-28 17:33:10 +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
07666f6ce2
Merge pull request #797 from ClementVieilly75/FTUEPopup
Popup early dev
2021-03-28 16:43:21 +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
4b8a2aca34
Merge pull request #849 from thecodingmachine/unloadingFixes
improved the back to better handle ghost connexions
2021-03-26 15:32:09 +01:00
kharhamel
3b6fe8da8d improved the back to better handle ghost connexions 2021-03-26 15:14:10 +01:00
Kharhamel
77c40985c4
Merge pull request #847 from thecodingmachine/unloadingFixes
improved the unloading process to not create a useless socket
2021-03-26 14:50:02 +01:00
David Négrier
d269596702
Fixing Discord invite link 2021-03-26 14:33:55 +01:00
kharhamel
886daebfea improved the unloading process to not create a useless socket 2021-03-26 14:19:37 +01:00
David Négrier
30e12702eb
Merge pull request #838 from thecodingmachine/fixChromeResize
FIX: resizing on wide screen on chrome now use the correct coordinates
2021-03-25 18:52:15 +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
DESKTOP-FMM8UI0\CLV
7140637807 Map tuto version 3 by Jack O 2021-03-25 09:06:41 +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
6f038001de
Merge pull request #836 from thecodingmachine/fixFullScreen
FIX: fixed a bug with fullscreen mode
2021-03-24 16:00:25 +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
1d69af0664
Merge pull request #835 from thecodingmachine/warningMessage
FIX: fixed a error in the validation of receiveGlobalMessagePrompt in pusher/AdminController
2021-03-24 14:37:50 +01:00
kharhamel
f90046459e FIX: fixed a error in the validation of receiveGlobalMessagePrompt in pusher/AdminController 2021-03-24 14:35:20 +01:00
Kharhamel
ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage
Warning message
2021-03-24 14:27:13 +01:00
DESKTOP-FMM8UI0\CLV
cb1459de96 remove exitUrl 2021-03-24 11:00:24 +01:00
DESKTOP-FMM8UI0\CLV
7c7916df60 remove useless files and clean code in ScriptTuto.js 2021-03-24 10:58:30 +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
DESKTOP-FMM8UI0\CLV
77e768e5f7 Add map Tuto v2 and scriptTuto.js 2021-03-23 16:00:24 +01:00
DESKTOP-FMM8UI0\CLV
f437b6057c subProject maps/Tuto 2021-03-23 15:58:32 +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
Kharhamel
210daf46e3
Merge pull request #832 from thecodingmachine/master
Hotfix from master
2021-03-23 11:11:17 +01:00
David Négrier
979e43bb05
Merge pull request #830 from thecodingmachine/discordbadge
Adding Discord badge to the README
2021-03-23 09:41:40 +01:00
David Négrier
23c33b2971 Adding Discord badge to the README
This should be merged only when the Discord widget mode is enabled on the server (otherwise the number of current users is not displayed)
2021-03-23 09:41:18 +01:00