Skip to content

Commit 5148ba3

Browse files
authored
Merge branch 'main' into fix/eperm_patching_2
2 parents fe4d250 + 4b9bfaf commit 5148ba3

File tree

17 files changed

+139
-147
lines changed

17 files changed

+139
-147
lines changed

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "0.24.0",
44
"private": true,
55
"main": "build/main/main.js",
6-
"productName": "HyperPlay",
76
"homepage": "./",
87
"license": "GPL-3.0-only",
98
"description": "HyperPlay",
@@ -73,7 +72,7 @@
7372
"@hyperplay/chains": "^0.5.0",
7473
"@hyperplay/check-disk-space": "^3.5.2",
7574
"@hyperplay/quests-ui": "^0.1.26",
76-
"@hyperplay/ui": "^1.9.9",
75+
"@hyperplay/ui": "^1.11.1",
7776
"@hyperplay/utils": "^0.3.7",
7877
"@mantine/carousel": "^7.12.0",
7978
"@mantine/core": "^7.12.0",
@@ -232,7 +231,7 @@
232231
"@hyperplay/extension-provider": "^0.0.9",
233232
"@hyperplay/mock-backend": "^0.0.1",
234233
"@hyperplay/overlay": "^1.0.0",
235-
"@hyperplay/patcher": "^0.0.21",
234+
"@hyperplay/patcher": "0.0.22",
236235
"@hyperplay/providers": "^0.1.0",
237236
"@hyperplay/proxy-server": "^0.0.11"
238237
},

pnpm-lock.yaml

+13-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/locales/en/translation.json

-1
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,6 @@
884884
"autoUpdateGames": "Automatically update games",
885885
"autovkd3d": "Auto Install/Update VKD3D on Prefix",
886886
"change-target-exe": "Select an alternative EXE to run",
887-
"checkForUpdatesOnStartup": "Check for HyperPlay Updates on Startup",
888887
"crossover-version": "Crossover/Wine Version",
889888
"custom_themes_path": "Custom Themes Path",
890889
"customWineProton": "Custom Wine/Proton Paths",

public/locales/fi/translation.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"accessibility": {
3-
"actions_font_family_no_default": "Toimintojen fonttiperhe (oletus): ",
3+
"actions_font_family_no_default": "Toimintojen kirjaisinperhe (oletus): ",
44
"all_tiles_in_color": "Näytä kaikki pelin laatat värillisinä",
5-
"content_font_family_no_default": "Sisältöfonttiperhe (oletus): ",
5+
"content_font_family_no_default": "Sisältökirjaisinperhe (oletus): ",
66
"fonts": "Fontit",
77
"title": "Esteettömyys",
88
"zoom": "Zoom"

public/locales/ru/translation.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,10 @@
696696
"achievements": "Достижения",
697697
"store": "Интернет-магазин",
698698
"library": "Библиотека",
699-
"downloadManager": "Скачать менеджер"
699+
"downloadManager": "Скачать менеджер",
700+
"docs": "Документы",
701+
"quests": "Квесты",
702+
"settings": "Настройки"
700703
},
701704
"status": {
702705
"installing": "Установка",
@@ -1028,7 +1031,8 @@
10281031
},
10291032
"viewAllQuests": {
10301033
"title": "Просмотр всех квестов"
1031-
}
1034+
},
1035+
"search": "Поиск"
10321036
},
10331037
"ALL": "Все",
10341038
"analytics": "Аналитика",

src/backend/config.ts

-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ class GlobalConfigV0 extends GlobalConfig {
295295
autoInstallDxvkNvapi: false,
296296
addSteamShortcuts: false,
297297
preferSystemLibs: false,
298-
checkForUpdatesOnStartup: !isLinux,
299298
autoUpdateGames: true,
300299
customWinePaths: isWindows ? null : [],
301300
defaultInstallPath: installPath,

src/backend/updater/updater.ts

+3-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { app, dialog, shell } from 'electron'
22
import { autoUpdater } from 'electron-updater'
33
import { t } from 'i18next'
44

5-
import { configStore, icon, isLinux } from '../constants'
5+
import { icon, isLinux } from '../constants'
66
import { logError, logInfo, LogPrefix } from '../logger/logger'
77
import { captureException } from '@sentry/electron'
88
import { getFileSize } from '../utils'
@@ -12,11 +12,9 @@ import { getErrorMessage, removeCachedUpdatesFolder } from './utils'
1212
// to test auto update on windows locally make sure you added the option verifyUpdateCodeSignature: false
1313
// under build.win in electron-builder.yml and also change the app version to an old one there
1414

15-
const appSettings = configStore.get_nodefault('settings')
16-
const shouldCheckForUpdates = appSettings?.checkForUpdatesOnStartup === true
1715
let newVersion: string
1816

19-
autoUpdater.autoDownload = shouldCheckForUpdates && !isLinux
17+
autoUpdater.autoDownload = !isLinux
2018
autoUpdater.autoInstallOnAppQuit = true
2119

2220
let isAppUpdating = false
@@ -29,7 +27,7 @@ const MAX_UPDATE_ATTEMPTS = 10
2927
const checkUpdateInterval = 3 * 1000 * 60 * 60
3028

3129
setInterval(async () => {
32-
if (shouldCheckForUpdates && !hasUpdated && !isAppUpdating) {
30+
if (!hasUpdated && !isAppUpdating) {
3331
logInfo('Checking for client updates...', LogPrefix.AutoUpdater)
3432
await autoUpdater.checkForUpdates()
3533
}
@@ -44,14 +42,6 @@ autoUpdater.on('update-available', async (info) => {
4442
return
4543
}
4644

47-
if (!shouldCheckForUpdates) {
48-
logInfo(
49-
'New update available, but user has disabled auto updates',
50-
LogPrefix.AutoUpdater
51-
)
52-
53-
return
54-
}
5545
newVersion = info.version
5646

5747
trackEvent({
Loading
Loading

0 commit comments

Comments
 (0)