Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix audio and quality settings menu on wayland #131

Merged
merged 31 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bf4c203
added the beginnings of audio support
catgirlcataclysm Sep 25, 2023
c2476a7
Merge branch 'Vencord:main' into main
catgirlcataclysm Sep 26, 2023
8ac5409
updated dependencies
catgirlcataclysm Sep 26, 2023
e902505
updated dependencies
catgirlcataclysm Sep 26, 2023
a7249ec
updated dependencies and pulled new changes from vencord/vesktop
catgirlcataclysm Sep 26, 2023
8655318
added constraints and fixed device not detected
catgirlcataclysm Sep 26, 2023
538c009
Merge branch 'Vencord:main' into main
catgirlcataclysm Sep 27, 2023
d717e9d
switched to try a different function for wayland stream control
catgirlcataclysm Sep 28, 2023
eb90500
Merge branch 'Vencord:main' into wayland-fixes
catgirlcataclysm Sep 28, 2023
bc7d802
fixed screensharing under wayland, but caused other issues by updatin…
catgirlcataclysm Sep 28, 2023
2e5c450
Merge branch 'wayland-fixes' of https://github.com/kaitlynkittyy/vesk…
catgirlcataclysm Sep 28, 2023
7847e6b
Merge branch 'Vencord:main' into main
catgirlcataclysm Sep 28, 2023
7409c65
Merge branch 'wayland-fixes' of https://github.com/kaitlynkittyy/vesk…
catgirlcataclysm Sep 28, 2023
29206b9
fixed broken merge
catgirlcataclysm Sep 28, 2023
0c8ce8e
continued to fix broken merge
catgirlcataclysm Sep 28, 2023
f1cacc5
MORE BROKEN MERGE STUFF AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaa
catgirlcataclysm Sep 28, 2023
c2e3722
more fixing
catgirlcataclysm Sep 28, 2023
5906a7e
removed stupid line from merge
catgirlcataclysm Sep 28, 2023
c4f6941
deleted more leftovers
catgirlcataclysm Sep 28, 2023
2b79ad8
removed unnecessary screensharing portal on wayland
catgirlcataclysm Sep 28, 2023
1e48f0c
Discard changes to .vscode/launch.json
catgirlcataclysm Sep 28, 2023
691997d
removed unneeded dependency
catgirlcataclysm Sep 28, 2023
5001300
fixed crash when cancelling screenshare
catgirlcataclysm Sep 28, 2023
70fbc7a
fixed package name and description in package.json
catgirlcataclysm Sep 28, 2023
5bb06ca
changed var to const
catgirlcataclysm Sep 28, 2023
de175f9
Discard changes to package.json
Vendicated Oct 3, 2023
7a6cb2e
Discard changes to src/renderer/hideGarbage.css
Vendicated Oct 3, 2023
4cda6c0
Discard changes to pnpm-lock.yaml
Vendicated Oct 3, 2023
c710f67
Merge branch 'virtmic' into wayland-fixes
Vendicated Oct 3, 2023
7313d47
fixes
Vendicated Oct 11, 2023
4aefd21
Merge branch 'virtmic' into wayland-fixes
Vendicated Oct 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "VencordDesktop",
"name": "vencorddesktop",
"version": "0.3.2",
"private": true,
"description": "",
"description": "A cross platform electron-based desktop app aiming to give you a snappier Discord experience with Vencord pre-installed.",
"keywords": [],
"homepage": "https://vencord.dev/",
"license": "GPL-3.0",
Expand All @@ -27,13 +27,13 @@
},
"devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@types/node": "^20.4.6",
"@types/react": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^6.2.1",
"@types/node": "^20.7.0",
"@types/react": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"@vencord/types": "^0.1.2",
"dotenv": "^16.3.1",
"electron": "^25.8.2",
"electron": "26.2.3",
"electron-builder": "^24.6.3",
"esbuild": "^0.18.17",
"eslint": "^8.46.0",
Expand All @@ -44,11 +44,11 @@
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"prettier": "^3.0.0",
"prettier": "^3.0.3",
"source-map-support": "^0.5.21",
"tsx": "^3.12.7",
"type-fest": "^4.1.0",
"typescript": "^5.1.6"
"tsx": "^3.13.0",
"type-fest": "^4.3.1",
"typescript": "^5.2.2"
},
"packageManager": "pnpm@8.6.11",
"engines": {
Expand All @@ -66,6 +66,7 @@
"LICENSE"
],
"linux": {
"icon": "build/icon.icns",
"category": "Network",
"maintainer": "vendicated+vesktop@riseup.net",
"target": [
Expand Down
Loading