From 1dfafd3da4301d38a603fda3a901ba63ffc855bc Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 6 Feb 2022 22:00:36 +0200 Subject: [PATCH] 2.1.3 - updated dependencies From previous commits: - added Futex2 option for Wine synchronization settings - fixed 100% CPU Usage lock on Discord RPC (!36) - added borderless windows option (!35) - reworked `enhancements` locales structure; added separate "Wine", "Game" and "Launcher" sections to the "Enhancements" settings - added "Use terminal" option to run the wine command in a separate terminal window - fixed `DXVK.apply()` compatibility with Wine-GE 7.* (b1c96039) - updated Hungarian and Norwegian - updated notahuman's shaders to v5 (!37) - disabled terminal usage in flatpaks --- README.md | 5 ++--- neutralino.config.json | 2 +- package.json | 14 +++++++------- scripts/bundle-appimage.cjs | 2 +- src/defaultSettings.ts | 25 ------------------------- src/ts/launcher/states/Launch.ts | 5 +++++ 6 files changed, 16 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index f20109a..f1b4e14 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ flatpak install launcher.moe com.gitlab.KRypt0n_.an-anime-game-launcher | Game version | Launcher version | Patch version | | :---: | :---: | :---: | -| 2.4.0 | 2.1.2 | 2.4.0 stable ✅ | +| 2.4.0 | 2.1.3 | 2.4.0 stable ✅ | We have our own [An Anime Game](https://discord.gg/ck37X6UWBp) discord server where you can ask any questions @@ -101,7 +101,6 @@ sudo dnf install unzip tar git curl xdelta cabextract libnotify | [MangoHud](https://github.com/flightlessmango/MangoHud) | To use MangoHud | | [vkBasalt](https://github.com/DadSchoorse/vkBasalt) | To use shaders | | [GameMode](https://github.com/FeralInteractive/gamemode) | To use GameMode (performance optimization) | -| [switcheroo-control](https://gitlab.freedesktop.org/hadess/switcheroo-control/) | To select the GPU launcher should use to run the game | These requirements can't be easily installed so you should do it manually @@ -151,7 +150,7 @@ This is our current roadmap goals. You can find older ones [here](repository/pag * Make notifications translations *(2.1.0)* * ToS Violation Window *(2.1.0)* * Add `latest.log` file generation *(2.1.2)* -* Add an option to show terminal with the wine's log of the game *(7375c743)* +* Add an option to show terminal with the wine's log of the game *(7375c743, released in 2.1.3)* * Add Chinese game's version support (due to changes in the Krock's patch) * Implement manual config flushing functionality from the Empathize's API * Add analytics window diff --git a/neutralino.config.json b/neutralino.config.json index 1076ff3..e38902d 100644 --- a/neutralino.config.json +++ b/neutralino.config.json @@ -1,6 +1,6 @@ { "applicationId": "com.gitlab.KRypt0n_.an-anime-game-launcher", - "version": "2.1.2", + "version": "2.1.3", "defaultMode": "window", "port": 0, "documentRoot": "/bundle/", diff --git a/package.json b/package.json index d833fc0..bbc4e43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "an-anime-game-launcher", - "version": "2.1.2", + "version": "2.1.3", "license": "GPL-3.0", "type": "module", "scripts": { @@ -11,21 +11,21 @@ "check": "svelte-check --tsconfig ./tsconfig.json" }, "dependencies": { - "@empathize/framework": "^1.4.5", + "@empathize/framework": "^1.4.6", "js-md5": "^0.7.3", "semver": "^7.3.5", "svelte-i18n": "^3.3.13", "yaml": "^1.10.2" }, "devDependencies": { - "@neutralinojs/neu": "^9.1.1", - "@sveltejs/vite-plugin-svelte": "^1.0.0-next.36", + "@neutralinojs/neu": "^9.1.2", + "@sveltejs/vite-plugin-svelte": "^1.0.0-next.37", "@tsconfig/svelte": "^3.0.0", "@types/js-md5": "^0.4.3", "neutralino-appimage-bundler": "^1.3.2", - "sass": "^1.49.0", - "svelte": "^3.46.3", - "svelte-check": "^2.4.1", + "sass": "^1.49.7", + "svelte": "^3.46.4", + "svelte-check": "^2.4.2", "svelte-preprocess": "^4.10.2", "tslib": "^2.3.1", "typescript": "^4.5.5", diff --git a/scripts/bundle-appimage.cjs b/scripts/bundle-appimage.cjs index 9322562..5bea936 100644 --- a/scripts/bundle-appimage.cjs +++ b/scripts/bundle-appimage.cjs @@ -39,7 +39,7 @@ const bundler = new Bundler({ output: path.join(__dirname, '../dist/An Anime Game Launcher.AppImage'), // Application version - version: '2.1.2' + version: '2.1.3' }); // Bundle project diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts index 9e33597..dd74625 100644 --- a/src/defaultSettings.ts +++ b/src/defaultSettings.ts @@ -225,30 +225,5 @@ export default new Promise(async (resolve) => { } }); - /** - * 2.1.0-beta1 -> 2.1.1 - */ - const winesync = await Configs.get('winesync'); - const fsr = await Configs.get('fsr'); - const winevd = await Configs.get('winevd'); - - if (winesync !== undefined) - { - await Configs.set('wine.sync', winesync); - await Configs.remove('winesync'); - } - - if (fsr !== undefined) - { - await Configs.set('wine.fsr', fsr); - await Configs.remove('fsr'); - } - - if (winevd !== undefined) - { - await Configs.set('wine.virtual_desktop', winevd); - await Configs.remove('winevd'); - } - resolve(); }); diff --git a/src/ts/launcher/states/Launch.ts b/src/ts/launcher/states/Launch.ts index 80b4b39..998cf83 100644 --- a/src/ts/launcher/states/Launch.ts +++ b/src/ts/launcher/states/Launch.ts @@ -125,6 +125,11 @@ export default (launcher: Launcher): Promise => { await Neutralino.filesystem.writeFile(launcherShadersFile, await Neutralino.filesystem.readFile(userShadersFile)); + /** + * Small workaround for notahuman's shaders + * because they require a file with an absolute path + * and we have to update it + */ if (shaders == 'notahuman') await Neutralino.os.execCommand(`sed -i 's/\\/the\\/absolute\\/path\\/to\\/NFAA.fx/${constants.paths.shadersDir.replaceAll('/', '\\/')}\\/${shaders}\\/NFAA.fx/g' "${path.addSlashes(await constants.paths.launcherDir)}/vkBasalt.conf"`); }