mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-03-09 15:40:26 +00:00
Merge branch 'main' into feature/accessibility-improvements
This commit is contained in:
commit
69d96cc290
13 changed files with 32 additions and 37 deletions
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
|
@ -1,5 +1,5 @@
|
||||||
name: Bug Report
|
name: Bug Report
|
||||||
description: Create a report to help us improve. Write in English, please.
|
description: Create a report to help us improve. Write in English.
|
||||||
title: "[BUG] Write a title for your bug"
|
title: "[BUG] Write a title for your bug"
|
||||||
labels: ["bug"]
|
labels: ["bug"]
|
||||||
body:
|
body:
|
||||||
|
@ -61,3 +61,5 @@ body:
|
||||||
required: true
|
required: true
|
||||||
- label: I am aware that Hydra team does not offer any support or help regarding the downloaded games.
|
- label: I am aware that Hydra team does not offer any support or help regarding the downloaded games.
|
||||||
required: true
|
required: true
|
||||||
|
- label: I have read the [Frequently Asked Questions (FAQ)](https://github.com/hydralauncher/hydra/wiki/FAQ).
|
||||||
|
required: true
|
||||||
|
|
24
README.md
24
README.md
|
@ -13,19 +13,19 @@
|
||||||
[](https://github.com/hydralauncher/hydra/actions)
|
[](https://github.com/hydralauncher/hydra/actions)
|
||||||
[](https://github.com/hydralauncher/hydra/releases)
|
[](https://github.com/hydralauncher/hydra/releases)
|
||||||
|
|
||||||
[](./README.pt-BR.md)
|
[](./docs/README.pt-BR.md)
|
||||||
[](./README.md)
|
[](./README.md)
|
||||||
[](./README.ru.md)
|
[](./docs/README.ru.md)
|
||||||
[](./README.uk-UA.md)
|
[](./docs/README.uk-UA.md)
|
||||||
[](./README.be.md)
|
[](./docs/README.be.md)
|
||||||
[](./README.es.md)
|
[](./docs/README.es.md)
|
||||||
[](./README.fr.md)
|
[](./docs/README.fr.md)
|
||||||
[](./README.de.md)
|
[](./docs/README.de.md)
|
||||||
[](./README.it.md)
|
[](./docs/README.it.md)
|
||||||
[](./README.cs.md)
|
[](./docs/README.cs.md)
|
||||||
[](./README.da.md)
|
[](./docs/README.da.md)
|
||||||
[](./README.nb.md)
|
[](./docs/README.nb.md)
|
||||||
[](./README.et.md)
|
[](./docs/README.et.md)
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hydralauncher",
|
"name": "hydralauncher",
|
||||||
"version": "3.0.2",
|
"version": "3.0.3",
|
||||||
"description": "Hydra",
|
"description": "Hydra",
|
||||||
"main": "./out/main/index.js",
|
"main": "./out/main/index.js",
|
||||||
"author": "Los Broxas",
|
"author": "Los Broxas",
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -312,7 +312,7 @@
|
||||||
"sending": "Saatmine",
|
"sending": "Saatmine",
|
||||||
"friend_request_sent": "Sõbrakutse saadetud",
|
"friend_request_sent": "Sõbrakutse saadetud",
|
||||||
"friends": "Sõbrad",
|
"friends": "Sõbrad",
|
||||||
"friends_list": "Sõbrade nimekiri",
|
"friends_list": "Sõprade nimekiri",
|
||||||
"user_not_found": "Kasutajat ei leitud",
|
"user_not_found": "Kasutajat ei leitud",
|
||||||
"block_user": "Blokeeri kasutaja",
|
"block_user": "Blokeeri kasutaja",
|
||||||
"add_friend": "Lisa sõbraks",
|
"add_friend": "Lisa sõbraks",
|
||||||
|
|
|
@ -57,14 +57,14 @@
|
||||||
"remove_from_library": "Supprimer de la bibliothèque",
|
"remove_from_library": "Supprimer de la bibliothèque",
|
||||||
"no_downloads": "Aucun téléchargement disponible",
|
"no_downloads": "Aucun téléchargement disponible",
|
||||||
"next_suggestion": "Suggestion suivante",
|
"next_suggestion": "Suggestion suivante",
|
||||||
"play_time": "Joué pour {{montant}}",
|
"play_time": "Joué pour {{amount}}",
|
||||||
"install": "Installer",
|
"install": "Installer",
|
||||||
"play": "Jouer",
|
"play": "Jouer",
|
||||||
"not_played_yet": "Vous n'avez pas encore joué à {{title}}",
|
"not_played_yet": "Vous n'avez pas encore joué à {{title}}",
|
||||||
"close": "Fermer",
|
"close": "Fermer",
|
||||||
"deleting": "Suppression du programme d'installation…",
|
"deleting": "Suppression du programme d'installation…",
|
||||||
"playing_now": "Jeu en cours",
|
"playing_now": "Jeu en cours",
|
||||||
"last_time_played": "Dernièrement joué {{période}}"
|
"last_time_played": "Dernièrement joué {{period}}"
|
||||||
},
|
},
|
||||||
"activation": {
|
"activation": {
|
||||||
"title": "Activer Hydra",
|
"title": "Activer Hydra",
|
||||||
|
|
|
@ -7,7 +7,7 @@ const { autoUpdater } = updater;
|
||||||
const restartAndInstallUpdate = async (_event: Electron.IpcMainInvokeEvent) => {
|
const restartAndInstallUpdate = async (_event: Electron.IpcMainInvokeEvent) => {
|
||||||
autoUpdater.removeAllListeners();
|
autoUpdater.removeAllListeners();
|
||||||
if (app.isPackaged) {
|
if (app.isPackaged) {
|
||||||
autoUpdater.quitAndInstall(true, true);
|
autoUpdater.quitAndInstall(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ const createGameShortcut = async (
|
||||||
const options = {
|
const options = {
|
||||||
filePath,
|
filePath,
|
||||||
name: removeSymbolsFromName(game.title),
|
name: removeSymbolsFromName(game.title),
|
||||||
|
outputPath: app.getPath("desktop"),
|
||||||
};
|
};
|
||||||
|
|
||||||
return createDesktopShortcut({
|
return createDesktopShortcut({
|
||||||
|
|
|
@ -219,7 +219,6 @@ export class AchievementWatcherManager {
|
||||||
const games = await gameRepository.find({
|
const games = await gameRepository.find({
|
||||||
where: {
|
where: {
|
||||||
isDeleted: false,
|
isDeleted: false,
|
||||||
winePrefixPath: Not(IsNull()),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@ import { HydraApi } from "../hydra-api";
|
||||||
import { getUnlockedAchievements } from "@main/events/user/get-unlocked-achievements";
|
import { getUnlockedAchievements } from "@main/events/user/get-unlocked-achievements";
|
||||||
import { Game } from "@main/entity";
|
import { Game } from "@main/entity";
|
||||||
import { achievementsLogger } from "../logger";
|
import { achievementsLogger } from "../logger";
|
||||||
import { SubscriptionRequiredError } from "@shared";
|
|
||||||
|
|
||||||
const saveAchievementsOnLocal = async (
|
const saveAchievementsOnLocal = async (
|
||||||
objectId: string,
|
objectId: string,
|
||||||
|
@ -119,14 +118,10 @@ export const mergeAchievements = async (
|
||||||
const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
|
const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
|
||||||
|
|
||||||
if (game.remoteId) {
|
if (game.remoteId) {
|
||||||
await HydraApi.put(
|
await HydraApi.put("/profile/games/achievements", {
|
||||||
"/profile/games/achievements",
|
id: game.remoteId,
|
||||||
{
|
achievements: mergedLocalAchievements,
|
||||||
id: game.remoteId,
|
})
|
||||||
achievements: mergedLocalAchievements,
|
|
||||||
},
|
|
||||||
{ needsSubscription: true }
|
|
||||||
)
|
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
return saveAchievementsOnLocal(
|
return saveAchievementsOnLocal(
|
||||||
response.objectId,
|
response.objectId,
|
||||||
|
@ -136,9 +131,7 @@ export const mergeAchievements = async (
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
if (!(err instanceof SubscriptionRequiredError)) {
|
achievementsLogger.error(err);
|
||||||
achievementsLogger.error(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
return saveAchievementsOnLocal(
|
return saveAchievementsOnLocal(
|
||||||
game.objectID,
|
game.objectID,
|
||||||
|
|
|
@ -167,7 +167,7 @@ export function GameDetailsContent() {
|
||||||
>
|
>
|
||||||
<Lottie
|
<Lottie
|
||||||
animationData={cloudAnimation}
|
animationData={cloudAnimation}
|
||||||
loop
|
loop={false}
|
||||||
autoplay
|
autoplay
|
||||||
style={{ width: 26, position: "absolute", top: -3 }}
|
style={{ width: 26, position: "absolute", top: -3 }}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -202,7 +202,7 @@ export default function GameDetails() {
|
||||||
top: -28,
|
top: -28,
|
||||||
left: -27,
|
left: -27,
|
||||||
}}
|
}}
|
||||||
loop
|
loop={false}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{t("next_suggestion")}
|
{t("next_suggestion")}
|
||||||
|
|
|
@ -126,7 +126,7 @@ export default function Home() {
|
||||||
<Lottie
|
<Lottie
|
||||||
lottieRef={flameAnimationRef}
|
lottieRef={flameAnimationRef}
|
||||||
animationData={flameAnimation}
|
animationData={flameAnimation}
|
||||||
loop
|
loop={false}
|
||||||
autoplay={false}
|
autoplay={false}
|
||||||
style={{
|
style={{
|
||||||
width: 30,
|
width: 30,
|
||||||
|
@ -153,7 +153,7 @@ export default function Home() {
|
||||||
<Lottie
|
<Lottie
|
||||||
animationData={starsAnimation}
|
animationData={starsAnimation}
|
||||||
style={{ width: 70, position: "absolute", top: -28, left: -27 }}
|
style={{ width: 70, position: "absolute", top: -28, left: -27 }}
|
||||||
loop={Boolean(randomGame)}
|
loop={false}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{t("surprise_me")}
|
{t("surprise_me")}
|
||||||
|
@ -165,7 +165,7 @@ export default function Home() {
|
||||||
<div style={{ width: 24, height: 24, position: "relative" }}>
|
<div style={{ width: 24, height: 24, position: "relative" }}>
|
||||||
<Lottie
|
<Lottie
|
||||||
animationData={flameAnimation}
|
animationData={flameAnimation}
|
||||||
loop
|
loop={false}
|
||||||
autoplay
|
autoplay
|
||||||
style={{
|
style={{
|
||||||
width: 40,
|
width: 40,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue