Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 13:17:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,151 Commits 9 Branches 38 Tags
6ab4fef0c55bc48b056918cf96bda498343d2ef5
Commit Graph

433 Commits

Author SHA1 Message Date
TheKodeToad
6ab4fef0c5 Merge remote-tracking branch 'upstream/develop' into data-packs 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-24 21:11:46 +00:00
Alexandru Ionut Tripon
d0b9073f60 Show online players on servers screen (#3112) 2025-03-16 08:30:12 +02:00
Echo J
14ab4055ff Reduce app ID hardcoding 
And rename the relevant build variable to make more sense

Signed-off-by: Echo J <tcg96nougat@gmail.com>
 2025-03-09 14:16:48 +02:00
Trial97
47af33ff6f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin 2025-02-21 08:40:33 +02:00
TheKodeToad
cc504f4a6c Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 17:02:50 +00:00
TheKodeToad
98ab686348 Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:18:19 +00:00
TheKodeToad
1b4b36df33 Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00:00
Trial97
49d82ab528 fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:49:42 +02:00
Trial97
7010b8acb6 fix the freeze with openglwidget 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:36:40 +02:00
Alexandru Ionut Tripon
c2f4389e5f Merge pull request #3254 from Trial97/remove_multimc 
remove EditAccountDialog
 2025-01-17 08:51:44 +02:00
Trial97
87ec7cdd39 move background to vertex buffer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-10 14:54:40 +02:00
Trial97
6fc386cfe9 Move shaders to separate files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-10 11:40:38 +02:00
Trial97
cd0895b237 Add skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-10 00:54:14 +02:00
Trial97
0f9ea5c949 remove drop label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:55:45 +02:00
Trial97
e01df73deb remove EditAccountDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 11:13:01 +02:00
iTrooz
dbb88ca7df move ServerPingTask in its own file 2024-11-28 17:46:42 +01:00
Jan200101
514ec99a03 Integrate switcheroo-control for discrete GPU support 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2024-11-25 22:29:39 +01:00
iTrooz
7cf24586c2 .hpp -> .h 2024-11-17 19:58:30 +01:00
iTrooz
b8035ca078 refactor header and code into 2 files 2024-11-17 19:50:52 +01:00
iTrooz
99ac11bc40 add my classes to CMakeLists 2024-11-17 19:10:15 +01:00
TheKodeToad
012bbca197 JavaSettingsWidget -> JavaWizardWidget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 14:51:43 +00:00
TheKodeToad
e6d4e5d78d Unify instance and global settings pt.1 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 23:46:30 +00:00
TheKodeToad
d157159106 Fix license headers and formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 22:29:43 +00:00
TheKodeToad
89a327d363 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-23 14:19:07 +01: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
TheKodeToad
538815e033 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-08 17:16:10 +01:00
TheKodeToad
3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-08 17:15:42 +01:00
Trial97
946e791d39 sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
0afdce8a31 Add extra step to macos java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 21:18:20 +03:00
Trial97
c85294af9d Improve wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 19:33:24 +03:00
Trial97
2622d3daa9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-09 08:11:11 +03:00
Trial97
14fb54afd9 Fix launch when no java is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-08 09:10:29 +03:00
Trial97
575cdb043b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:29:43 +03:00
Trial97
92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
TheKodeToad
e2f3641395 Merge branch 'develop' into data-packs 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-22 20:00:49 +01:00
TheKodeToad
2ad34c724e Make log colours themeable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-21 22:19:50 +01:00
Trial97
23c06f23c3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 2024-08-19 22:35:11 +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
c9809fff6d add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +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
Rachel Powers
a94a081b9c add better profile logging properly resolve important dependencies 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Trial97
0b79abcdcd Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
leia uwu
c1d0560524 perf: print api servers asynchronously on instance launch 
Doing this on the main thread can cause the launcher to freeze for up to
5 seconds when launching an instance on my system
so i moved it to a launch step where it gets all the servers info
asynchronously to print

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-06-20 17:58:00 -03:00
Trial97
d0584684f2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +03:00
Trial97
2ffabbdc6d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 10:00:52 +03:00
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
5bd28e2cc8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +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