Commit Graph

2025 Commits

Author SHA1 Message Date
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
PizZaKatZe
821f91e996 Finer steps for audio volume 2021-03-22 20:10:27 +01:00
PizZaKatZe
599fdd6ceb Fix group icons and audio attenuation 2021-03-22 20:09:11 +01:00
TabascoEye
e6accd711d Store muted setting of audio player in local storage
This commit was originally authored by @TabascoEye, then rebased and
improved by @pizkaz:

* refactors local user storage, adding audio player settings
* stores "muted" state of audio player in local store
2021-03-22 20:09:11 +01:00
PizZaKatZe
5bd6f49846 Fix (now legacy) 'playAudioLoop' property 2021-03-22 20:09:11 +01:00
PizZaKatZe
fdbcd98a9a Implement audio volume and loop properties 2021-03-22 20:09:11 +01:00
PizZaKatZe
132c6c9ad6 Fix volume auto-reduction in conversations 2021-03-22 20:09:09 +01:00
PizZaKatZe
5a7e67f5df Reflect volume change in audio control 2021-03-22 20:06:55 +01:00
PizZaKatZe
20d3236e73 Fix audio control box appearance 2021-03-22 20:06:55 +01:00
David Négrier
f9a2097bc9
Merge pull request #828 from thecodingmachine/develop
Deploy 2021-03-22
2021-03-22 16:42:28 +01:00
David Négrier
4966789b3b
Merge pull request #663 from shug0/patch-1
Correct the local app url in README
2021-03-22 16:33:03 +01:00
David Négrier
ce0ede7613
Merge pull request #805 from thecodingmachine/dependabot/npm_and_yarn/front/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4 in /front
2021-03-22 16:31:59 +01:00
David Négrier
6bb757e8b5
Merge pull request #824 from workadventure-xce/fix/front-page-template
Fix/front page template
2021-03-22 16:30:53 +01:00
Kharhamel
04bd60ca26
Merge pull request #827 from workadventure-xce/fix/jitsi_integration
Fix Jitsi integration
2021-03-22 16:27:32 +01:00
David Négrier
9da0acb0d7
Merge pull request #814 from Wikinaut/patch-1
update /etc/hosts readme
2021-03-22 16:12:48 +01:00
DESKTOP-FMM8UI0\CLV
3ef3561b57 no message 2021-03-22 16:10:21 +01:00
DESKTOP-FMM8UI0\CLV
0ffbf8b4b7 Add Final popup to notify that the tuto is finished, some CSS on the popups and clean code 2021-03-22 16:09:04 +01:00