ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,568 Commits 4 Branches 5 Tags 40 MiB
78ceae9c17
Commit Graph

638 Commits

Author SHA1 Message Date
Trial97
11ae169087
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Trial97
1e0db46728
add a more verbose error message in case user skin import fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 21:29:56 +03:00
Trial97
04b2ac2efa
update fail url skin messagebox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 20:48:49 +03:00
Trial97
689b76885c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance 
Made Custom New Instance scrollable
 2024-06-07 16:37:21 +10:00
TheKodeToad
a70aeeea2b
Merge branch 'develop' into list-image-append-fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-06-01 15:20:21 +01:00
Trial97
83883cadf9
fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 19:30:10 +03:00
Trial97
f350918186
force initial size for the Add Instance dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 19:03:40 +03:00
Trial97
817ff1ecbd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 10:20:48 +03:00
Alexandru Ionut Tripon
2145f9f0ac
Merge pull request #1847 from Trial97/move_export2 
Improvements to modlist export
 2024-05-31 09:58:32 +03:00
Trial97
eaccdca02d
added error message for import skin from user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 16:21:08 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
c9c67ef79e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
633489884d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Trial97
6aaf3a3ed4
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector 2024-05-18 11:57:06 +03:00
Trial97
2ac6efaa4a
Fix reggresion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 11:56:43 +03:00
Trial97
23134d4b72
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-18 11:38:18 +03:00
Alexandru Ionut Tripon
0f2736306e
Update launcher/ui/dialogs/skins/SkinManageDialog.ui 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-18 10:36:15 +03:00
Trial97
09c0c11033
Add back device code flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 21:58:25 +03:00
Alexandru Ionut Tripon
898ee67a07
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-16 00:41:07 +03:00
Trial97
abedc6a23c
Improve login UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:25:15 +03:00
Trial97
80d8e3ee06
Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Trial97
e285a85fe8
Removed AccountTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:51 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Kenneth Chew
e7c95c9ccb
Fix bug where watched directories are not clickable on macOS 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:57:04 -04:00
Kenneth Chew
4787141698
Improved blocked mods dialog permissions prompt 
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:30:06 -04:00
SabrePenguin
51f4ede797 Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-05-01 00:11:53 -04:00
SabrePenguin
b9c010ffb2 Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-30 23:43:36 -04:00
Trial97
a5b059ebad
Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 00:27:15 +03:00
Trial97
d88fb266a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2024-04-20 17:42:58 +03:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Trial97
1930689a27
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:12:02 +02:00
Tayou
0f178270be
Merge pull request #1786 from Trial97/deps_improve 
Make dependency checking more lax
 2024-03-27 20:42:26 +01:00
Sefa Eyeoglu
5d72ee1c4f
Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Trial97
1322277ae6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
TheKodeToad
4101fbb634
Allow multiline description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-03-01 01:05:03 +00:00
Trial97
41d52dc347
Remove dependencies if review mods is rejected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-29 00:06:28 +02:00
Trial97
0a3303bcbd
Added button to add extra java path to the Java Wizzard 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 21:07:12 +02:00
Sefa Eyeoglu
bc75bcdcca
Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:18:31 +01:00
Sefa Eyeoglu
0b3e91ac62
Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-10 09:17:52 +02:00
TheKodeToad
1130fe8510
Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-02 18:04:42 +00:00
Sefa Eyeoglu
0ccdcd23e3
fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-12-14 13:02:29 +01:00
Trial97
763eab6b96
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
Trial97
4498d32cc0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-12-13 14:37:02 +02:00
Sefa Eyeoglu
79218cf13b
Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:08:26 +01:00
Trial97
6f6b6312a5
Moved the button up 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-27 09:39:31 +02:00
Trial97
1a0fd5f993
Added mod reinstall dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-25 00:18:10 +02:00
Trial97
20e0cb43b9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
2db5677281
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
Trial97
1650237c8f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
Trial97
403a7f5d46
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2 2023-11-23 23:21:11 +02:00
Trial97
3234bb5a8c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97
9c13504b06
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok 2023-11-23 16:13:09 +02:00
Trial97
afcdb7595c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 16:01:54 +02:00
Trial97
908072710a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 14:34:56 +02:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Trial97
54c308e5b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 21:15:12 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
Alexandru Ionut Tripon
1150249cec
Merge pull request #1746 from Trial97/toggle_deps 
separated dependecy check from mod update
 2023-11-17 19:42:22 +00:00
Trial97
bedb4da869
Added filename to the modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 19:37:23 +02:00
Trial97
6804e2ba59
moved export to list to the mods page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 18:40:45 +02:00
Trial97
99fbcbee4c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-14 18:12:48 +02:00
Trial97
17916dbd24
Fixed inconsistent Ok in instance import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-12 20:27:55 +02:00
Alexandru Ionut Tripon
9d653f172a
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-08 08:56:48 +02:00
Trial97
4dc9e65875
Formated the suggestion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon
54187a505f
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-07 20:39:12 +02:00
Trial97
8897f16d1d
simplify microsoft login 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 10:52:52 +02:00
Trial97
011e87b421
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:38:14 +02:00
Trial97
7a0b2a316a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:19:58 +02:00
Alexandru Ionut Tripon
8eac0d34bd
Merge pull request #1796 from Trial97/dep_global_toggle 
Added Global Dependenicies toggle
 2023-11-06 20:48:51 +00:00
Trial97
9a8667e99c
Added Global Dependenicies toggle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 22:22:49 +02:00
Alex
cf4144cb50 Fixed link to Fulmine's website 
Signed-off-by: Alex <akim8@emich.edu>
 2023-11-05 00:46:05 -04:00
Trial97
a4978946d5
disabled lax deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 00:07:51 +02:00
Trial97
b18082376d
Fixed visual bug with Modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 11:04:13 +02:00
Trial97
1490193402
added button to disable dependencies on the mod review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:14:26 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07:00
Trial97
321bbf1fa8
fixed asan stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 19:06:38 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03:00
Trial97
8b8ea2d270
ensured that the variant is allways uppercase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:37:25 +03:00
Trial97
44cdf3f697
Fixed skin variant 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:33:00 +03:00
Trial97
263dc5af67
Fixed remane and delete of selected skin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:56:26 +03:00
Trial97
a5938a7de9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:26:05 +03:00
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Trial97
f7c9972db0
separated dependecy check from mod update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 19:46:30 +03:00
Trial97
932cd9e262
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 11:32:05 +03:00
Trial97
a9d7af9096
removed some unused stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:44:37 +03:00
Trial97
8d4f508cc6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-18 18:08:48 +03:00
Trial97
30f73a0696
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 18:08:31 +03:00
Trial97
165d218300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib 2023-10-18 09:07:36 +03:00
Trial97
fea4c4eba8
Updated filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 09:00:45 +03:00
Trial97
869f654a10
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +03:00
Tayou
436db23ffc
Merge pull request #1268 from Ryex/feat/launcher-updater 
Feat: Windows (And portable linux / appimage) Auto Updater
 2023-10-16 19:53:50 +02:00
Alexandru Ionut Tripon
0927035a26
Merge pull request #1549 from Trial97/atlauncher_browser 
added suport for atlauncher browser download
 2023-10-16 06:39:12 +01:00
Tayou
5985d8b118
Merge pull request #1383 from TheKodeToad/rename-groups 
Rename groups
 2023-10-15 23:38:27 +02:00
Trial97
9d15255e0a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser 2023-10-15 20:52:38 +03:00