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

847 Commits

Author SHA1 Message Date
Trial97
38b5ee198a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00
TheKodeToad
e9791d6bc1
Merge pull request #2633 from Trial97/refactor_minecraft_update 
refactor MinecraftUpdate Task
 2024-08-18 11:44:44 +01:00
Alexandru Ionut Tripon
6b07e8e72d
Merge pull request #2718 from cthbleachbit/develop 
mangohud support: MangoHud::getLibraryString should return absolute path
 2024-08-12 11:26:30 +03:00
Alexandru Ionut Tripon
d2daacf736
Merge pull request #2716 from Trial97/quickPlaySingleplayer 
add setting for quickplay singleplayer
 2024-08-12 11:25:25 +03:00
Tianhao Chai
c2192cfa98
mangohud support: getLibraryString should return absolute path when possible 
Some distros ship MangoHub vulkan layer json with bare shared object name
instead of an absolute path. This breaks environment config as
`MinecraftInstance::createLaunchEnvironment()` seems to require absolute
path of `libMangoHud.so`.

Since we already have `MangoHud::findLibrary()` lying around, use that to
figure out where `libMangoHud.so` really is. In case of a platform that
doesn't support `dlopen()`, fallback to old behavior and return the path
verbatim as it is recorded in vk layer json.

Signed-off-by: Tianhao Chai <cth451@gmail.com>
 2024-08-09 14:11:44 -04: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
Edgars Cirulis
ba7391308e
Restore connect line for device authorization in MSADeviceCodeStep 
Parent PRs: https://github.com/PrismLauncher/PrismLauncher/pull/2617

Fixes https://github.com/PrismLauncher/PrismLauncher/issues/2705

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-08-05 22:12:18 +03:00
Alexandru Ionut Tripon
9d684dcb82
Merge pull request #2617 from Trial97/clean_net 
remove duplicate code from net folder
 2024-08-05 10:56:40 +03:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-24 11:47:45 +03:00
Trial97
63a380a039
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 22:06:09 +03:00
Trial97
91d03b34ac
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Alexandru Ionut Tripon
69c55d90ce
Merge pull request #2558 from Trial97/update_filters 
Resolve issue with multiple loaders during mod update
 2024-07-19 15:46:15 +03:00
Ben Westover
fb10cb5fdf
Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04:00
Trial97
b989c5a36c
refactor MinecraftUpdate Task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-10 16:24:31 +03:00
Trial97
061fdc1ada
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-09 18:36:23 +03:00
timoreo
39b4293a62
Merge pull request #1752 from Trial97/fix_duplicate_mod 2024-07-09 10:32:56 +02:00
timoreo
ebd7974fcc
Merge pull request #2416 from Trial97/retry_auth 2024-07-09 09:57:32 +02:00
Trial97
71c7dd1c5d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 21:51:34 +03:00
Trial97
c07260e836
remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Trial97
a6ae078e7e
add docs to Library.cpp 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:30:26 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
cf220356b1
fixed panic with recursive eventloop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
0a95b57c0a
moved QEventLoops inside functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
06e1cab41f
force online in case the offline load failed 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
2af6902b42
validate metadata on launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:26 +03:00
Trial97
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +03:00
Trial97
ddf1ea014c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-28 20:39:37 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
147741e616
increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
Trial97
9d7c36c2fc
made identty certain if the login ended 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-27 15:35:44 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Alexandru Ionut Tripon
1fcad8d427
Merge pull request #1886 from Trial97/time4 
Fixed playtime recording
 2024-06-24 23:07:41 +03:00
Trial97
00b83efb9a
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +03:00
Trial97
2ac89c2378
add more states for account refresh fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 01:49:37 +03:00
Trial97
b0386a4c2f
added better error handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:47:48 +03:00
Trial97
24aa337a64
fixed offline accounts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:27:49 +03:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash 
Refactor hash task
 2024-06-18 22:55:32 +03:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate 
fix: update datapack and resourcepack versions
 2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 18:05:34 +02:00
Trial97
766ddc80e3
refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 10:17:48 +02:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake 
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
 2024-06-17 23:12:07 -04:00
Trial97
5fbbdb9707
fix merge issues 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:31:31 +03:00
Trial97
f1d1c9e22c
forget sort keys 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15
add size back to texture view 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:43:21 +03:00
Trial97
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00