Compare commits

..

22 Commits
v1.2.4 ... test

Author SHA1 Message Date
Janis
59594125a5 change version to 1.3.1 2023-10-07 17:15:09 +02:00
Janis
32108d7a99 change author and version 2023-10-07 17:10:37 +02:00
Janis
5c8d9721b2 add quick instructions 2023-10-07 17:06:25 +02:00
Janis
24f3e6dd88 Rewrite instructions 2023-10-07 16:36:19 +02:00
Janis
3461e2be0a Add new instruction for the easy online usage 2023-10-07 16:04:48 +02:00
Janis
456d09d647 update version to 1.2.5 2023-10-07 15:42:53 +02:00
Janis
09d24b2acd Merge pull request #75 from DerTyp7/dependabot/npm_and_yarn/types/node-20.8.3
Bump @types/node from 20.8.0 to 20.8.3
2023-10-07 15:41:33 +02:00
dependabot[bot]
389033e795 Bump @types/node from 20.8.0 to 20.8.3
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.0 to 20.8.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-07 13:41:03 +00:00
Janis
76ee50e262 Merge pull request #76 from DerTyp7/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-6.7.4
Bump @typescript-eslint/eslint-plugin from 6.7.3 to 6.7.4
2023-10-07 15:40:26 +02:00
Janis
2fb3c47e33 uninstall jest (not used) 2023-10-07 15:40:07 +02:00
dependabot[bot]
7676e72ca1 Bump @typescript-eslint/eslint-plugin from 6.7.3 to 6.7.4
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.7.3 to 6.7.4.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.7.4/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-07 13:39:09 +00:00
Janis
7bd7786465 Merge pull request #70 from DerTyp7/dependabot/npm_and_yarn/sass-1.68.0
Bump sass from 1.64.1 to 1.68.0
2023-10-07 15:38:39 +02:00
Janis
e27cd40234 Merge pull request #71 from DerTyp7/dependabot/npm_and_yarn/types/node-20.8.0
Bump @types/node from 20.4.5 to 20.8.0
2023-10-07 15:38:32 +02:00
Janis
13080ca9d1 Merge pull request #72 from DerTyp7/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-6.7.3
Bump @typescript-eslint/eslint-plugin from 6.2.0 to 6.7.3
2023-10-07 15:38:26 +02:00
Janis
a74ae8988f Merge pull request #73 from DerTyp7/dependabot/npm_and_yarn/types/react-18.2.23
Bump @types/react from 18.2.15 to 18.2.23
2023-10-07 15:38:19 +02:00
Janis
31b564d676 Merge pull request #74 from DerTyp7/dependabot/npm_and_yarn/postcss-8.4.31
Bump postcss from 8.4.26 to 8.4.31
2023-10-07 15:38:10 +02:00
Janis
c9c31a3e64 update package.json values 2023-10-07 15:37:34 +02:00
dependabot[bot]
db770ab2b1 Bump postcss from 8.4.26 to 8.4.31
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.26 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.26...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-07 13:21:18 +00:00
dependabot[bot]
9d3a30462c Bump @types/react from 18.2.15 to 18.2.23
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.15 to 18.2.23.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 01:33:44 +00:00
dependabot[bot]
dbb171ef11 Bump @typescript-eslint/eslint-plugin from 6.2.0 to 6.7.3
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.2.0 to 6.7.3.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.7.3/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 01:33:23 +00:00
dependabot[bot]
66e8f699e3 Bump @types/node from 20.4.5 to 20.8.0
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.4.5 to 20.8.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 01:32:22 +00:00
dependabot[bot]
c8a44d5a5d Bump sass from 1.64.1 to 1.68.0
Bumps [sass](https://github.com/sass/dart-sass) from 1.64.1 to 1.68.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.64.1...1.68.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 01:31:48 +00:00
4 changed files with 209 additions and 2457 deletions

View File

@@ -8,48 +8,79 @@ This overlay uses the [Teamspeak 5 Remote App API](https://github.com/DerTyp7/re
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/d0ab06f2-1a36-479d-826f-bd4bd3d405b7) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/d0ab06f2-1a36-479d-826f-bd4bd3d405b7)
- [Teamspeak5-OBS-Overlay](#teamspeak5-obs-overlay) - [Teamspeak5-OBS-Overlay](#teamspeak5-obs-overlay)
- [Setup](#setup) - [Usage](#usage)
- [Customization (Parameters)](#customization-parameters) - [Quick instructions (online usage only)](#quick-instructions-online-usage-only)
- [Instructions](#instructions)
- [Settings (Parameters)](#settings-parameters)
- [Are you using the **online** version (recommended version)?](#are-you-using-the-online-version-recommended-version)
- [Are you using the **offline** version?](#are-you-using-the-offline-version)
- [Adding Parameters](#adding-parameters)
- [Setup (Developer)](#setup-developer) - [Setup (Developer)](#setup-developer)
- [Common Issues](#common-issues) - [Common Issues](#common-issues)
- [The overlay is empty, but i'm connected to a Teamspeak 5 server](#the-overlay-is-empty-but-im-connected-to-a-teamspeak-5-server) - [The overlay is empty, but i'm connected to a Teamspeak 5 server](#the-overlay-is-empty-but-im-connected-to-a-teamspeak-5-server)
## Setup ## Usage
1. Download the `ts5-overlay-{version}.html` of the latest release from [here](https://github.com/DerTyp7/ts5-obs-overlay/releases/latest) ### Quick instructions (online usage only)
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/04dc3a66-c493-429b-b4ae-44bade473ad6)
1.1. (optional) You can rename the file. Just remember using the new file name in the future instead of `ts5-overlay-{version}.html` 1. Go into the Teamspeak 5 Settings and enable "Remote Apps"
2. Go into the Teamspeak 5 Settings and enable "Remote Apps" 2. Add a new Browser Source to your OBS Scene and enter `https://dertyp7.github.io/ts5-obs-overlay/` as URL
3. Set the width and height to your desired size (e.g. 1920x1080 OR 1280x720)
4. You should now receive a notification in Teamspeak 5 that the app is allowed to connect to your Teamspeak 5 client. Allow it.
### Instructions
1. Go into the Teamspeak 5 Settings and enable "Remote Apps"
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/b31bc553-fde2-46ab-b07c-d3c81339cc7d) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/b31bc553-fde2-46ab-b07c-d3c81339cc7d)
3. Add a new Browser Source to your OBS Scene 2. Add a new Browser Source to your OBS Scene
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/0198b468-bb96-4b65-bdd4-3d6bb3ef7d25) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/0198b468-bb96-4b65-bdd4-3d6bb3ef7d25)
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/58ad399f-5344-456f-b243-6e267b489fd5) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/58ad399f-5344-456f-b243-6e267b489fd5)
4. Tick the checkbox "Local File" and select the downloaded `ts5-overlay-{version}.html` 3. Configure **Browser Source** (Use **ONE** of the following methods)
4.1. Set the width and height to your desired size (e.g. 1920x1080 OR 1280x720)
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/5ad8ce69-645b-45e7-acc3-ce7ba8d7f8ab)
1. **Online Usage (recommended):** Enter **`https://dertyp7.github.io/ts5-obs-overlay/`** as URL
2. **Offline Usage (ignore this if you use the online usage above):**
1. Download the `ts5-overlay-{version}.html` of the latest release from [here](https://github.com/DerTyp7/ts5-obs-overlay/releases/latest)
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/04dc3a66-c493-429b-b4ae-44bade473ad6)
1.1. (optional) You can rename the file. Just remember using the new file name in the future instead of `ts5-overlay-{version}.html`
2. Tick the checkbox "Local File" and select the downloaded `ts5-overlay-{version}.html`
4. Set the width and height to your desired size (e.g. 1920x1080 OR 1280x720)
5. You should now receive a notification in Teamspeak 5 that the app is allowed to connect to your Teamspeak 5 client. Allow it. (If you don't get a notification, restart Teamspeak 5 and OBS -> try again) 5. You should now receive a notification in Teamspeak 5 that the app is allowed to connect to your Teamspeak 5 client. Allow it. (If you don't get a notification, restart Teamspeak 5 and OBS -> try again)
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/40faa435-e128-415f-98eb-a9e8809e8f65) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/40faa435-e128-415f-98eb-a9e8809e8f65)
### Customization (Parameters) ## Settings (Parameters)
You can customize the overlay by adding parameters to the URL of the Browser Source. You can customize the overlay by **adding parameters** to the URL of the **Browser Source**.
### Are you using the **online** version (recommended version)?
1. Open your Browser Source settings
2. Start adding parameters like discribed in [Adding Parameters](#adding-parameters)
### Are you using the **offline** version?
1. Open your Browser Source settings 1. Open your Browser Source settings
2. **Untick** the checkbox "Local File" 2. **Untick** the checkbox "Local File"
3. Add `file://` to the beginning of the URL 3. Add `file://` to the beginning of the URL
![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/87985b4c-4397-4681-9635-239d1e382c24) ![image](https://github.com/DerTyp7/ts5-obs-overlay/assets/76851529/87985b4c-4397-4681-9635-239d1e382c24)
4. Start adding parameters like discribed below 4. Start adding parameters like discribed in [Adding Parameters](#adding-parameters)
### Adding Parameters
Start by adding a `?` to the end of the URL and then add the parameters. Start by adding a `?` to the end of the URL and then add the parameters.
To add multiple parameters, you have to seperate them with a `&`. To add multiple parameters, you have to seperate them with a `&`.
Like this: `file://C:/Users/.../ts5-overlay-{version}.html?parameter1=value1&parameter2=value2` Like this:
Real example: `file://C:/Users/.../ts5-overlay-{version}.html?remoteAppPort=5899&hideNonTalking=true&clientLimit=5` **Online:** _`https://dertyp7.github.io/ts5-obs-overlay/?parameter1=value1&parameter2=value2`_
**Offline:** _`file://C:/Users/.../ts5-overlay-{version}.html?parameter1=value1&parameter2=value2`_
This is a list of all available parameters (all parameters are optional): Real example:
**Online:** _`https://dertyp7.github.io/ts5-obs-overlay/?remoteAppPort=5899&hideNonTalking=true&clientLimit=5&showChannelName=true`_
**Offline:** _`file://C:/Users/.../ts5-overlay-{version}.html?remoteAppPort=5899&hideNonTalking=true&clientLimit=5&showChannelName=true`_
This is a **list** of **all available parameters** (all parameters are optional):
| Parameter | Description | Type | Default | | Parameter | Description | Type | Default |
| ----------------- | ---------------------------------------- | ------- | --------------- | | ----------------- | ---------------------------------------- | ------- | --------------- |

2584
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,9 @@
{ {
"name": "ts5-obs-overlay", "name": "ts5-obs-overlay",
"private": true, "private": true,
"version": "1.2.3", "version": "1.3.1",
"description": "Overlay for OBS to show the current talking clients in your Teamspeak 5 Channel",
"homepage": "https://dertyp7.github.io/ts5-obs-overlay",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@@ -10,19 +12,18 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@types/node": "^20.4.5", "@types/node": "^20.8.3",
"jest": "^29.6.1",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-router-dom": "^6.14.2", "react-router-dom": "^6.14.2",
"react-ts5-remote-app-api": "^1.1.1", "react-ts5-remote-app-api": "^1.1.1",
"sass": "^1.64.1" "sass": "^1.68.0"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^29.5.2", "@types/jest": "^29.5.2",
"@types/react": "^18.2.14", "@types/react": "^18.2.23",
"@types/react-dom": "^18.2.7", "@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.2.0", "@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.2.1", "@typescript-eslint/parser": "^6.2.1",
"@vitejs/plugin-react-swc": "^3.0.0", "@vitejs/plugin-react-swc": "^3.0.0",
"eslint": "^8.45.0", "eslint": "^8.45.0",

View File

@@ -11,9 +11,9 @@ export default function App() {
remoteAppPort: parseInt(searchParams.get("remoteAppPort") ?? "5899"), remoteAppPort: parseInt(searchParams.get("remoteAppPort") ?? "5899"),
auth: { auth: {
identifier: "de.tealfire.obs", identifier: "de.tealfire.obs",
version: "1.2.3", version: "1.3.1",
name: "TS5 OBS Overlay", name: "TS5 OBS Overlay",
description: "A OBS overlay for TS5 by DerTyp876", description: "A OBS overlay for TS5 by DerTyp7",
}, },
logging: true, logging: true,
}); });