88 Commits

Author SHA1 Message Date
TheKodeToad
cd4f119e4b Replace getThemedIcon with APPLICATION->logo()
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 00:07:05 +01:00
Yihe Li
d77889f26d Change log to be a QMainWindow
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 23:15:55 +08:00
Yihe Li
ef3bf75715 Remove some duplicate code
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 16:15:29 +08:00
Yihe Li
289645266a Add support for view older launcher logs
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-03 06:08:32 +08:00
Yihe Li
c58cc3396a Basic support for launcher log page
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-03 04:51:41 +08:00
TheKodeToad
618e6bd96b Merge remote-tracking branch 'upstream/develop' into rework-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-05-22 23:04:57 +01:00
Trial97
cb01d5c46e feat: refactor logs upload to use the NetJob
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 00:12:09 +03:00
TheKodeToad
adf2ed0849 Only fire apply event when settings are actually applied
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-23 15:22:17 +00:00
Trial97
162bbcfe19 rename some variables
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-03 23:55:43 +02:00
Tayou
887e4a964a Merge pull request #3010 from Trial97/lock3 2024-10-30 21:56:17 +01:00
Michael Tyson
ced2f9d1a0 Applied clang formatting
Signed-off-by: Michael Tyson <michael@atastypixel.com>
2024-10-30 12:51:34 +11:00
Michael Tyson
43e4481b70 Support for launching from command line in offline mode
This allows launching an offline instance with --offline --name=OfflineName. This is useful for playing split screen by creating two side-by-side instances, which is impossible online, unless one is using two separate paid accounts.

With this PR, it makes it possible to launch from a script - otherwise, one has to launch manually, which is a pain, or create offline profiles for each instance, which interferes with some functionality like skins (my autistic son takes great issue with his skin not being visible, when using offline profiles!).

Implementation is based on MultiMC, which supports this feature.

See also https://github.com/PrismLauncher/PrismLauncher/issues/1059 for discussion.

Signed-off-by: Michael Tyson <michael@atastypixel.com>
2024-10-30 12:30:20 +11:00
Trial97
11d4d948aa lock m_instanceExtras
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-27 12:36:14 +02:00
Trial97
73d33f93b3 Replaced QSet with QHash
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-22 09:41:00 +03:00
Trial97
562c301326 skip QSaveFile temprary files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-22 01:22:31 +03:00
Trial97
2030041fcc Fix tests segfault
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 21:42:14 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-17 00:20:40 +03:00
Trial97
dcca175b36 snake_case to m_camelCase
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-09 11:06:31 +03:00
Trial97
c9809fff6d add setting for quickplay singleplayer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-08 16:53:26 +03:00
Trial97
0f311453e1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-30 22:54:23 +03:00
Trial97
c4a65dd861 update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
Trial97
ba990e075b Added JavaPath function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-08 19:45:46 +02:00
Trial97
a0e7729aa6 Started workin on stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-24 18:26:43 +02:00
TheKodeToad
befa3baa6a Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-30 11:47:33 +01:00
TheKodeToad
f99b04bd16 Merge pull request #1320 from TheKodeToad/better-launch
Combine launch buttons in instance window, persist profiler
2023-08-19 11:08:02 +01:00
TheKodeToad
ffd8ed550f Reformat
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17 18:53:32 +01:00
Sefa Eyeoglu
e88418ab7f Merge pull request #1392 from Scrumplex/feat-native-override 2023-08-17 16:09:16 +02:00
TheKodeToad
3e2733d840 Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-16 22:23:38 +01:00
Trial97
1faf741004 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 13:29:42 +03:00
Trial97
c94ee67077 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 12:16:00 +03:00
Sefa Eyeoglu
83aa0062c7 feat: add custom native library path settings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:51:21 +02:00
Tayou
9afa7cc91f Merge branch 'develop' into icon-indexing
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
2023-08-07 10:32:38 +02:00
Sefa Eyeoglu
74fe2fb2a6 Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle 2023-08-06 21:54:00 +02:00
Sefa Eyeoglu
1d468ac35a chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:35 +02:00
Rachel Powers
7c1a465ec9 Merge branch 'develop' into feat/launcher-updater
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30 14:19:31 -07:00
TheKodeToad
57430fd189 Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-22 11:26:02 +01:00
TheKodeToad
1a7c5693cc Remove redundant methods
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-21 13:01:01 +01:00
TheKodeToad
f8b935ab37 Merge remote-tracking branch 'upstream/develop' into icon-indexing 2023-07-21 12:48:05 +01:00
TheKodeToad
842f08dcfc (UX) Add open folder button next to combo boxes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-20 11:54:15 +01:00
Trial97
f046bd7d50 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-19 12:26:12 +03:00
TheKodeToad
97662f5c8e Multiple icon themes!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-18 22:51:34 +01:00
TheKodeToad
22327bbe71 Combine launch buttons in Instance window, persist profiler
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-06 18:07:45 +01:00
Rachel Powers
e38adf6006 fix(updater) fixes form first round of testing
- reset update time after check

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-29 14:01:11 -07:00
Tayou
1dc7f80034 4 clang-tidy changes, update copyright info
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
2023-06-28 23:08:04 +02:00
Rachel Powers
1f70589deb feat(updater): tie in part 2, let there be UI!
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-26 01:22:33 -07:00
Trial97
bf95cfb30e Added CatPacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 01:37:28 +03:00
Rachel Powers
b1ffc8ddab refactor: normalize url fn & cleanup
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-12 16:37:45 -07:00
Rachel Powers
a3173b5371 fix: ensure Application accepts URLs and local files form cmd args
refactor: Move curseforge:// url scheme detection to Import Page
feat: pass along extra CF pack info so pack metadata is established.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-05 15:05:17 -07:00
Rachel Powers
a80b425551 fix: no need for const bool
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-01 10:48:00 -07:00
Rachel Powers
96decbac27 feat: default qtlogging.ini file
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-01 10:48:00 -07:00