Commit Graph

9213 Commits

Author SHA1 Message Date
Trial97
d5fb9f0935
force aspect ratio for skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:21:21 +03:00
Trial97
8cdaf5d05f
fix tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 23:27:27 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Trial97
1a84dc9bca
no need for extra exist check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:47:42 +03:00
Trial97
b872f88617
do not double rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:46:39 +03:00
Trial97
d2510b851b
mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:45:15 +03:00
Trial97
2d51008304
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00
Alexandru Ionut Tripon
3c4eed13a3
Merge pull request #1829 from Trial97/demo
Fixed demo mode
2024-06-14 18:41:02 +03:00
Trial97
9d16557328
simplify constructor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 16:40:27 +03:00
Trial97
863ebe421c
randomize server port
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 16:38:41 +03:00
Trial97
52490743b4
revert desktop file creation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 14:16:23 +03:00
Trial97
164d31dcb1
fix win build take#2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 13:09:22 +03:00
Trial97
3db4f4dc2b
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 13:00:59 +03:00
Trial97
8db0b5f421
Register mime-type on the fly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:48:37 +03:00
Trial97
f60d0135f7
made login link to open browser
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:47:44 +03:00
Trial97
74a86df53c
update the desktop file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:41:37 +03:00
Trial97
1bd4e60e99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-14 11:23:52 +03:00
Trial97
c35461b314
remove aspect ratio
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:23:14 +03:00
Trial97
014721ca10
remove unused import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:19:54 +03:00
Trial97
712fbc3a4b
reverse login layout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:15:40 +03:00
Alexandru Ionut Tripon
580e38a985
Merge pull request #2510 from PrismLauncher/backport-2509-to-release-8.x
[Backport release-8.x] fix(flatpak): disable docs for glfw
2024-06-14 08:59:31 +03:00
Sefa Eyeoglu
8d7f916f80 fix(flatpak): disable docs for glfw
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 52338f0e88)
2024-06-14 05:58:04 +00:00
Alexandru Ionut Tripon
e9d681a088
Merge pull request #2509 from Scrumplex/fix/flatpak/glfw
fix(flatpak): disable docs for glfw
2024-06-14 08:57:50 +03:00
Sefa Eyeoglu
52338f0e88
fix(flatpak): disable docs for glfw
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-06-13 19:55:50 +02:00
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 19:20:32 +03:00
Alexandru Ionut Tripon
658244574a
Merge pull request #2508 from PrismLauncher/backport-2405-to-release-8.x
[Backport release-8.x] Fix portable if manifest is missing
2024-06-13 19:16:39 +03:00
Alexandru Ionut Tripon
119295c87f Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit ab5f628453)
2024-06-13 16:16:28 +00:00
Alexandru Ionut Tripon
263b167aae Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 051e788683)
2024-06-13 16:16:28 +00:00
Trial97
56b64edc44 Fix portable if manifest is missing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c15f6fcd2a)
2024-06-13 16:16:27 +00:00
Alexandru Ionut Tripon
1a51cb76ad
Merge pull request #2507 from PrismLauncher/backport-2439-to-release-8.x
[Backport release-8.x] fix vanilla technic modpacks
2024-06-13 19:16:21 +03:00
Alexandru Ionut Tripon
3fc5f56ed6
Merge pull request #2405 from Trial97/fix_missing_manifest
Fix portable if manifest is missing
2024-06-13 19:16:12 +03:00
Trial97
e475f4ed36 fix vanilla technic modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f4f0a61bf2)
2024-06-13 16:15:57 +00:00
Alexandru Ionut Tripon
ce5b2c54c5
Merge pull request #2439 from Trial97/fix_vanila_technic
fix vanilla technic modpacks
2024-06-13 19:15:43 +03:00
Trial97
f7c3e08ac8
add prismlauncher to plist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 18:27:37 +03:00
Trial97
7fdc65eda8
add tooltip to url button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 08:51:11 +03:00
Trial97
2b229d7326
increase qr code size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:20:16 +03:00
Trial97
80ea67f7cf
finish login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:00:08 +03:00
Alexandru Ionut Tripon
0a27d3859c
Merge pull request #2506 from PrismLauncher/backport-2499-to-release-8.x
[Backport release-8.x] update imgur upload
2024-06-12 23:45:55 +03:00
Trial97
cd6f061335 update imgur upload
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c1c182fd0c)
2024-06-12 20:45:31 +00:00
Alexandru Ionut Tripon
a74bebb358
Merge pull request #2499 from Trial97/imgur3
update imgur upload
2024-06-12 23:45:17 +03:00
Trial97
125fb2eaf2
remove png qr code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:58 +03:00
Trial97
5f5296ef5e
update ui once again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:19 +03:00
Trial97
bbbe7c879e
update callback
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 12:35:02 +03:00
Trial97
df142550fe
update Add account question
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
Tayou
6b1c4981e7
Merge pull request #2498 from LaoshuBaby/patch-1
fix(SkinManageDialog.cpp): typo
2024-06-10 13:21:51 +02:00
Trial97
c1c182fd0c
update imgur upload
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 12:38:59 +03:00
快乐的老鼠宝宝
1c1e296960
fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
2024-06-10 17:15:38 +08:00
Alexandru Ionut Tripon
ab6c5c122e
Merge pull request #2497 from PrismLauncher/backport-2425-to-release-8.x
[Backport release-8.x] improve invalid path name
2024-06-10 12:13:25 +03:00
Trial97
317b127330 add some comments
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d1286bbe90)
2024-06-10 09:11:36 +00:00