diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37865af..45d0a85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,9 @@ jobs: - name: Rename output files run: | - mv out/make/deb/x64/vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb ./vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb - mv out/make/rpm/x64/vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm ./vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm + tag=${{ github.event.release.tag_name }} + mv out/make/deb/x64/vtt-desktop-client_${tag//-/\~}_amd64.deb ./vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb + mv out/make/rpm/x64/vtt-desktop-client-${tag//-/.}-1.x86_64.rpm ./vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm mv out/make/zip/linux/x64/vtt-desktop-client-linux-x64-${{ github.event.release.tag_name }}.zip ./vtt-desktop-client-linux-x64-${{ github.event.release.tag_name }}.zip - name: Archive production artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/fork.yml b/.github/workflows/fork.yml index 279b208..204cff1 100644 --- a/.github/workflows/fork.yml +++ b/.github/workflows/fork.yml @@ -4,6 +4,7 @@ on: push: tags: - "1.*" + - "!1.*-*" jobs: fork: if: github.repository_owner == 'OmegaRogue' diff --git a/.idea/fvtt-player-client.iml b/.idea/fvtt-player-client.iml index 540ab7a..2f16c99 100644 --- a/.idea/fvtt-player-client.iml +++ b/.idea/fvtt-player-client.iml @@ -10,8 +10,5 @@ - - - \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..08760a7 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +.PHONY: build + +export VERSION +build: + yarn install + if [ -z $${$VERSION+x} ]; then yarn version --no-git-tag-version --new-version $$VERSION;fi + yarn run electron-forge make --platform linux --targets '@electron-forge/maker-zip' \ No newline at end of file diff --git a/README.md b/README.md index 6b2c937..fc13a36 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,38 @@ wiki https://wiki.theripper93.com/free/vtt-desktop-client +## Differences between this and theripper93's player client + +| Feature | [theripper93](https://github.com/theripper93/fvtt-player-client) | omegarogue | +|----------------------------------------------|:----------------------------------------------------------------:|:----------:| +| Back to server select button in setup screen | ✔️ | ✔️ | +| Back to server select button in login screen | ✔️ ️ | ✔️ | +| Back to server select button in game | ❌ | ✔️ | + +## Customization + +You can pre-configure and customize the client by editing the `config.json` file. +From where the executable is located, +you can find the `config.json` file by navigating to the `resources/app` folder. +You can edit the file with any text editor. + +Example config: + +```json +{ + "games": [ + { + "name": "This is the name of my game", + "url": "https://www.nintendo.com/games/detail/the-legend-of-zelda-breath-of-the-wild-switch" + } + ], + "background": "https://images2.alphacoders.com/123/123862.jpg", + "backgroundColor": "#000000", + "textColor": "white", + "accentColor": "green" +} +``` + ## Getting data from `localStorage` to put into `config.json` ```js diff --git a/index.html b/index.html index 2289429..8dcc2e7 100644 --- a/index.html +++ b/index.html @@ -97,6 +97,10 @@ +
+ + +
@@ -109,9 +113,7 @@

Put this in your config.json file to include it installation-wi