mirror/PrismLauncher
1
0 Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-09-14 23:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,409 Commits 18 Branches 57 Tags
3680a052d0359d4e02668153ca3ac4ed9196fc12
Commit Graph
98 Commits
Author SHA1 Message Date
Vishrut Sachan 601101555f Merge remote-tracking branch 'upstream/develop' into feature/global-playtime-counter 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>

# Conflicts:
#	launcher/InstanceList.h
 2026-08-07 10:25:55 +05:30
Alexandru Ionut Tripon 9c4c466453 Allow selecting instance directory when creating a new instance (#5870) 2026-08-06 06:57:50 +00:00
Alexandru Ionut Tripon 5f0039faa1 Change InstanceList to only hold MinecraftInstance (#5896) 2026-08-06 06:56:54 +00:00
TheKodeToad 8d2528dc10 Change InstanceList to only contain MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2026-08-05 18:47:14 +01:00
Vishrut Sachan d7ea89fd9e Migrate legacy instgroups.json to new location 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-05 21:58:08 +05:30
Vishrut Sachan dac05d1c31 Gate global playtime tracking behind CountGameTime setting 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 20:05:43 +05:30
Vishrut Sachan cb8531b549 Remove unused InstanceList playtime methods 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 16:30:03 +05:30
Vishrut Sachan 0bfac60ee4 Move playtime counter to separate playtime.cfg file 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 15:53:34 +05:30
Vishrut Sachan 52e65bfb7c use qCritical, drop unused default param and dead empty-check 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 03:35:48 +05:30
Vishrut Sachan c31a7cd7b3 Add persistent global playtime counter 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-03 14:29:20 +05:30
Vishrut Sachan 20e8f02c88 Exclude inaccessible dirs from picker, fail loudly on invalid target dir 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-02 19:11:09 +05:30
Vishrut Sachan bd1625e77e Merge remote-tracking branch 'upstream/develop' into feature/select-instance-dir 2026-08-02 08:15:20 +05:30
Vishrut Sachan b2ab004a2b Allow selecting instance directory when creating a new instance 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-02 07:52:45 +05:30
Alexandru Ionut TriponandOctol1ttle 444efb6bae Apply suggestions from code review 
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2026-08-01 17:51:38 +03:00
Trial97 62eb9963a1 chore(clang-tidy): fix clang tidy warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 10:23:28 +03:00
Trial97 7df7c1d344 chore(clang-tidy): fix clang tidy warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 10:14:48 +03:00
Trial97 d1e75c15ed remove InstanceName 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 09:54:09 +03:00
Octol1ttle 9919f3d058 Add support for multiple instance directories (#5827) 2026-07-31 21:15:52 +00:00
Octol1ttle b237ae7f00 Add option whether to count instance in total playtime (#5765) 2026-07-28 09:11:13 +00:00
Vishrut Sachan 14461e31fa Address review feedback 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-28 00:11:05 +05:30
Vishrut Sachan ed556a5a15 Extracted helper for Flatpak warning, fixed formatting, fixed symlink handling for multiple directories 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-24 08:48:15 +05:30
Vishrut Sachan 4de86ded14 Add support for multiple instance directories 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-24 00:08:17 +05:30
Vishrut Sachan 78e9067972 Fix instance shortcuts breaking when the instance is renamed 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-22 12:40:20 +05:30
arch1t3cht c0c862d94e Add option whether to count instance in total playtime 
The use case here is making a copy of your instance as a backup (say,
when migrating to a new modpack version) and wanting to keep the old
copy displayed in Prism. In that case, the old instance can now be
configured to not count towards total playtime. This way, the instance,
including its playtime, can be fully preserved and displayed in Prism,
but the total playtime statistic stays accurate.

Closes #4937.

Signed-off-by: arch1t3cht <arch1t3cht@gmail.com>
 2026-07-08 21:16:48 +02:00
Trial97 b7344af313 fix pack upgrade 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-04-10 00:36:05 +03:00
Octol1ttle 13d9e0be4d InstanceList: clean up includes 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-03-16 01:43:05 +05:00
Octol1ttle 764600704d fix(InstanceList): include lowercase windows.h 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-03-16 01:42:59 +05:00
Seth Flynn 352b98db8e Enable warnings as errors (#5101) 2026-03-06 07:42:39 +00:00
Octol1ttle ec4b36b299 Fix compiler warnings 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-26 17:49:11 +05:00
Octol1ttle dde1d21cbc run clang-format to apply new qualifier alignment 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-25 12:31:31 +05:00
Alexandru Ionut Tripon 71abf3beec Download game files during instance creation (#4944) 2026-02-17 20:23:06 +00:00
Octol1ttle f59e5b2df9 change: set abort button to "Skip" when downloading game files 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-10 22:42:19 +05:00
abhicommands 68f98491d5 Fix InstanceStaging success reentry assertion crash 
Signed-off-by: abhicommands <114682464+abhicommands@users.noreply.github.com>
 2026-02-06 22:42:32 -05:00
Octol1ttle 625f0060a1 feat: download game files during instance creation 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-04 09:11:09 +05:00
Trial97 d05b996c8a fix build 
also fixed some warninigs of unused vars and formated the code again

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-01-17 02:28:56 +02:00
Octol1ttle 01c1840531 refactor(InstanceList): use vector<unique_ptr> to store instances 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-01-11 21:00:04 +05:00
Octol1ttle 549405ab2f refactor!!!: migrate from shared pointers 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-01-11 21:00:03 +05:00
Yihe Li 50fb2db718 Validate JSON parsing results 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-02 07:36:53 +08:00
Yihe Li d2ee023788 Switch to JSON-encoded store 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 16:13:40 +08:00
Yihe Li 7c3a810d3d Implement persistence by storing shortcut in settings 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 14:16:47 +08:00
Yihe Li d3f337d6ef Delete shortcut when deleting instances 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 08:13:18 +08:00
Rachel Powers 0e00c28450 Console colors and log invocation location (#3654) 2025-04-18 20:38:55 -07:00
Rachel Powers 45b6454222 feat(ansi-console): Format console with ansi excapes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2025-04-18 00:39:19 -07:00
Trial97 442aae88ce chore: remove qt version checks from code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-17 23:46:55 +03:00
Trial97 82bffabb69 do not capture by default all values in lambdas 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 18:16:43 +02:00
Alexandru Ionut TriponandTayou aeb7f29a5b Update launcher/InstanceList.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-07-08 15:04:27 +03:00
Trial97 fdcd1068f3 remove some poly mentions from the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 14:53:39 +03:00
Rachel Powers 14b09549e1 feat(instanceList) persist "ungrouped" hidden state 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-25 01:55:54 -07:00
Trial97 3a4f82ffd1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
TheKodeToad c0eb80947d Fix build on Windows and formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-24 21:50:51 +00:00