0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,357 Commits 1 Branch 0 Tags 29 MiB
527c1113f1
Commit Graph

760 Commits

Author SHA1 Message Date
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts 2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic. 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes 2022-11-14 21:09:37 -03:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI 2022-11-14 14:16:01 -08:00
flow
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings 2022-11-14 14:15:46 -08:00
Sefa Eyeoglu
5be9472912
fix: fix potentially uninitialized variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 21:20:38 +01:00
Redson
be765f8d88
feat: Add empty menu 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-14 16:33:25 -03:00
TheLastRar
fce323b945 Check parent in rowCount/columnCount/canFetchMore 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
f8a137a26e Mark loadExtraPackInfo abstract 
All classes that inherit from ModModel override this method

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
ADudeCalledLeo
ce892c9e77
Add icon 
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 21:02:31 +02:00
Sefa Eyeoglu
e14b998da3
refactor: improve readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 18:38:12 +01:00
Ryan Cao
2c9452efaf
Merge branch 'develop' into macos-add-to-path 2022-11-14 19:26:31 +08:00
Ryan Cao
97a7af855f
slight reword: "install to PATH" 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-14 19:21:47 +08:00
ADudeCalledLeo
5be8545edc
Windows, Linux: prevent segfault on missing icon 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 20:18:51 +02:00
ADudeCalledLeo
b0269e6dfc
Linux: fixes 
- Fix shortcut icons
- Possibly fix shortcut creation on AppImages
- Fix shortcut not working if path to launcher contains spaces

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 17:51:29 +02:00
ADudeCalledLeo
43b9d9484d
tabs -> spaces 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:49:28 +02:00
ADudeCalledLeo
69bbb29328
Mac: attempt 2 
- create .command files instead of .sh
- fix shortcuts not working if path to Prism Launcher contains spaces
- fix path to executable in shortcutss
- add check for running from extracted folder (prevents creating shortcuts)

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:47:37 +02:00
flow
577069cfb4
fix: don't have the clear button on instance page filters 
This thing is otherworldly unoptimized. o.O

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-12 19:23:57 -03:00
Sefa Eyeoglu
335bec68fb
fix: prevent abort for un-abortable tasks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
ADudeCalledLeo
5322155b19
Mac: fix build 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:48:21 +02:00
ADudeCalledLeo
45ce72593a
Windows: remove icon if shortcut creation fails 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:43:58 +02:00
ADudeCalledLeo
b813c867b5
refactor #if checks 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:41:52 +02:00
ADudeCalledLeo
f7d7d76ee8
Mac: now supported! [UNTESTED] 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:36:49 +02:00
ADudeCalledLeo
dbe0553b4a
Move addAction call above left-align loop 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
9be48f1dc4
this ain't static, falco 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
6043444e4e
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:30 +02:00
ADudeCalledLeo
487e352642
Fix nested #if directive 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:29 +02:00
ADudeCalledLeo
cc5f82bfac
Windows: fix window icon being replaced 
Dunno why it happens but the fix was literally 2 lines, so whatever I guess

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
4d4dfab388
Windows: add instance icon to shortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
6ae3b183fd
Remove unnessecary "is defined" check 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
f12117c532
[UNTESTED] Linux: add icons to shortcuts 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:26 +02:00
ADudeCalledLeo
70768189ba
Windows: implement FS::createShortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:25 +02:00
ADudeCalledLeo
30b266622c
Add 'Create shortcut' button to instance toolbar 
Implemented on Windows only rn!

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:18:49 +02:00
Rachel Powers
25b306b7e1 feat: mark folder paths as links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:32:11 -07:00
Rachel Powers
9af1b00df5 feat: add list of watched folders 
move explanation text into dialog class and it's own label

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:05:19 -07:00
Rachel Powers
51c27e2748 always use the pending path set to avoid task duplication. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:33:52 -07:00
Rachel Powers
b9e2c3524c chore: clang format & cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:07:57 -07:00
Rachel Powers
3f6cc17818 properly handle a currently running hashing task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 15:45:40 -07:00
Rachel Powers
5909af9878 drag&drop + add folder to watch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 14:17:33 -07:00
flow
64576f4c4c
Merge pull request #304 from Ryex/move-downloads 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222
 2022-11-11 12:48:53 -08:00
Sefa Eyeoglu
b57fee1a44
fix: swap spin box and state icon 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:24:14 +01:00
Sefa Eyeoglu
cabd887866
feat: use icons to show memory allocation state 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:22:16 +01:00
Sefa Eyeoglu
863a168cb5
feat: raise memory limits to 1TiB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:05:00 +01:00
Sefa Eyeoglu
5ee4fb3522
feat: validate maximum memory allocation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:04:05 +01:00
flow
46a8e18841
Merge pull request #367 from TheKodeToad/linkjumping 
fix https://github.com/PrismLauncher/PrismLauncher/issues/363
 2022-11-10 08:08:44 -08:00
flow
6c53e68a52
Merge pull request #406 from Scrumplex/fix-clear-metadata 2022-11-10 07:50:14 -08:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
TheKodeToad
99ed0b6c2c Implement flowln's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-10 11:14:58 +00:00
TheKodeToad
16e3b786fc Implement Scrumplex's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-06 10:09:06 +00:00
DioEgizio
126bbd67f7
Merge pull request #405 from AshtakaOOf/spooky 2022-11-06 07:27:39 +01:00
Sefa Eyeoglu
9fb80a2687
Merge pull request #242 from marcelohdez/more-copy-options 2022-11-06 01:10:24 +01:00
Sefa Eyeoglu
d5d224d89a
fix: save metacache after clearing 
If the user closes the launcher right after clearing, it probably
didn't actually clear the cache yet.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 01:05:13 +01:00
Sefa Eyeoglu
4708ce4226
refactor: rename halloween cats to -spooky 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:47:33 +01:00
Sefa Eyeoglu
a0580946dc
fix: allow -ween variants for all cats 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:04:43 +01:00
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock 2022-11-06 00:00:47 +01:00
leo78913
0938f80b41
Update launcher/ui/MainWindow.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-05 18:10:36 -03:00
Ryan Cao
3df31579a1
fix: @timoreo22 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:31:38 +08:00
Ryan Cao
cf3aad9c41
fix: use osascript to get admin privileges 
inspired from VSCode's approach

Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:18:05 +08:00
Ryan Cao
7b1e68bfa8
initial support for add to PATH action 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:17:59 +08:00
Sefa Eyeoglu
ba8322aa5c
Merge pull request #396 from leozamboni/develop 2022-11-05 11:17:13 +01:00
Sefa Eyeoglu
e4bd82190a
Merge pull request #149 from TayouVR/better-custom-themes 2022-11-05 11:16:41 +01:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils 
General utilities can go in here >:)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:24 -03:00
leozamboni
9f5537d936
feat: spooky cat for halloween 
Signed-off-by: leozamboni <leonardonunes169@gmail.com>
 2022-11-04 15:09:57 -03:00
txtsd
8f045af867
Merge pull request #374 from flowln/fix_lto 2022-11-04 15:39:41 +05:30
Tayou
c2f37716e5
clang_format for PR files 
I'm getting a rendezvous... I thought I did this already

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:05:07 +01:00
Tayou
e9bfd43ff7
added requested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:04:36 +01:00
leo78913
3d11d044d2 add an option to lock the toolbars 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-02 20:33:02 -03:00
TheKodeToad
cb796dbdfb
Remove unnecessary block 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 16:38:32 +00:00
Sefa Eyeoglu
094b57bb23
Merge pull request #372 from santiagocezar/rory 2022-11-02 12:06:08 +01:00
Santiago Cézar
9ca4f19aea remove logcat 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-02 07:45:43 -03:00
TheKodeToad
a29d88c313 Even more fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:59:58 +00:00
TheKodeToad
a1ed8154f7 Another fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:31:39 +00:00
TheKodeToad
6c45a990ef A good use of auto 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:13:44 +00:00
TheKodeToad
8dfa3393dc Formatting and forward-declaration 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 08:43:46 +00:00
Santiago Cézar
48d34741f3 keyboard navigation is important 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 22:53:45 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Santiago Cézar
668342b470 add rory flat too (and holiday variants) 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:31:37 -03:00
Santiago Cézar
0a0ce74105 add rory 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:06:27 -03:00
txtsd
718a9a3559
change: Update credits 
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team

Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-02 01:20:58 +05:30
Tayou
afcdf4b9cf
condensed icon theme code 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:18:07 +01:00
Tayou
a3f5ea3598
added suggested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
TheKodeToad
576867605d Add another fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd Slight cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7 Only select correct mod 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439 Hacky tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61 Auto-select first result 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7 Add more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d Initial better mod browser link implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 16:58:22 +00:00
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
d2f3dbaa29 fix mispellings and wrap strings for translation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:48 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:46 +01:00