lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
1586 commits 21 branches 1 tag 50 MiB
Commit graph

1586 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Négrier 96492e8594
Merge pull request #826 from workadventure-xce/fix/scrollbars 
Remove scroll bars
 2021-03-22 15:06:23 +01:00
PizZaKatZe 318c63ab90 Fix Jitsi integration 
Jitsi iframes are rendered directly in the cowebsite div next to the
cowebsite > main element. This patch fixes the situation.
 2021-03-22 11:36:14 +01:00
PizZaKatZe 13fcda7bcf Remove scroll bars 2021-03-21 12:55:14 +01:00
PizZaKatZe c0bf5755ed front: Fix page template 2021-03-21 11:28:02 +01:00
PizZaKatZe 97ec721c2a front: Fix page template indentation 2021-03-21 11:28:02 +01:00
Kharhamel 519018f6c5
Merge pull request #764 from githubIsNotOpenSourceLOL/patch-1 
Use email address from .env
 2021-03-19 17:30:12 +01:00
David Négrier 4660b450c5
Merge pull request #700 from thecodingmachine/audioCameraPermission 
Input need camera and microphone permission
 2021-03-19 17:09:48 +01:00
GRL e50c8bc354 Suppression of *{...} in every HTML files because the style.ccs file already declare it. 
Suppression unused code
 2021-03-19 16:21:35 +01:00
GRL 0eb16bce6f Suppression width in Html file 2021-03-19 15:58:02 +01:00
GRL 1cfb22f695 Creation of the HelpCameraSettingsScene 
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
 2021-03-19 15:40:07 +01:00
GRL 0b00055eda Use includes instead of indexOf 2021-03-19 14:40:18 +01:00
GRL c654f722e3 Add Firefox image 
Check permissions in the game
Button Continue to continue without allowing camera and microphone
 2021-03-19 12:04:37 +01:00
Gregoire Parant d68406d5e1 Create input need page 2021-03-19 12:02:42 +01:00
Kharhamel 1f85e548ce
Merge pull request #816 from thecodingmachine/iframeResize 
FEATURE: complete control over the iframe size
 2021-03-18 16:16:54 +01:00
kharhamel 32fdfaab35 edited CoWebsiteManager to manage vertical resizing 2021-03-18 16:11:22 +01:00
githubIsNotOpenSourceLOL ec691a75fe
Update .env.template 2021-03-18 13:26:02 +01:00
kharhamel 0701e607fa added sass loader to the project and put the cowebsite style in its own sass file 2021-03-18 12:37:05 +01:00
kharhamel f9c8b4131c added fullscreen 2021-03-17 18:57:00 +01:00
kharhamel 272be3eba0 improve the visual of the cowebsite 2021-03-17 18:35:19 +01:00
kharhamel 3f6c61633a FEATURE: complete control over the iframe size 2021-03-17 18:34:12 +01:00
Kharhamel 19856c0ee9
Merge pull request #783 from Moini/patch-1 
Improve visibility of close button for embedded web pages
 2021-03-17 14:35:11 +01:00
David Négrier 4a50729db3
Merge pull request #817 from thecodingmachine/customjitsiurl 
Adding the ability to specify a custom Jitsi URL directly in the map
 2021-03-16 21:33:35 +01:00
David Négrier ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map 
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
 2021-03-16 20:37:12 +01:00
Wikinaut d8c74fa838
update /etc/hosts readme 2021-03-15 15:37:51 +01:00
David Négrier 086b88b09a Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV 662134498c Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-12 17:06:42 +01:00
DESKTOP-FMM8UI0\CLV c5c8770a60 Add First Version of Tuto 
PopUp
Player Control disable
Fake bubble displayed
 2021-03-12 16:39:29 +01:00
Kharhamel 18fa1e6153
Merge pull request #807 from thecodingmachine/improvePlayerAnims 
FIX: player anims correctly stop on the idle frame
 2021-03-11 16:34:20 +01:00
kharhamel fe8c75610d FIX: player anims correctly stop on the idle frame 2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV fa4d917729 Resolve conflit with GameScene.ts 2021-03-11 16:03:39 +01:00
DESKTOP-FMM8UI0\CLV 6c21a31004 Update Map Tuto 2021-03-11 15:17:53 +01:00
Gregoire Parant 59c310d0a8 Update to optimize maintainability of the code 2021-03-11 12:17:37 +01:00
DESKTOP-FMM8UI0\CLV 6441fa71d3 Adding placeHolder Popup tuto to Map2 
need to cut player controller and simulate bobble
 2021-03-11 10:58:48 +01:00
Gregoire Parant 2fcb8a76b1 Merge branch 'master' into develop 
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts
 2021-03-11 02:22:05 +01:00
grégoire parant ce6976ec34
Merge pull request #806 from thecodingmachine/hot-fix-moderate-controls 
Hot fix moderate controls
 2021-03-11 02:13:15 +01:00
Gregoire Parant 2cf99df2da Hot Fix report 2021-03-11 02:03:06 +01:00