CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,858 Commits 10 Branches 30 Tags
Commit Graph

1407 Commits

Author SHA1 Message Date
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Trial97
9ca74cd009
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-03 00:48:13 +03:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme 2023-06-02 12:18:37 +02:00
Rachel Powers
5fe9e30f39 fix: use instance settings, make image column user resizeable, fix memory leak 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 14:53:15 -07:00
Rachel Powers
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Rachel Powers
eb079c8060
cleanup: msgbox msg editor 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 11:13:53 -07:00
Trial97
b4dff181f7
Fixed Ptr logic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:22:55 +03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:01:39 +03:00
Trial97
bdff8591aa
Removed extra loop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:54:46 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:44:23 +03:00
Trial97
bf0a577fb9
Fixed repaint issue 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 16:57:35 +03:00
Rachel Powers
7af116fb00 refactor: function scope statics 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284 cleanup: move qstyle getInstance decl inline 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 04:37:09 -07:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 02:15:39 -07:00
Rachel Powers
37420405c7 fix(memory leak): refactor NoBigComboStyle -> singleton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-27 23:22:40 -07:00
Rachel Powers
ff03dd22fe fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 21:10:49 -07:00
Rachel Powers
aae892dfd1 fix(memory leak): IndexedPack too large to live inside a qlist without pointers () 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 19:21:07 -07:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-25 16:16:58 -07:00
Rachel Powers
086a7e19f0 feat: Column on left, hideable 
- columns are hideable (saves to settings)
- image column moved to left
- datamodals can provide resize modes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-24 20:15:34 -07:00
Tayou
3c937532f2
fix System theme colors on windows 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-05-24 15:18:08 +02:00
TheKodeToad
863027cbe8 Enable size grip 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-22 11:56:54 +01:00
Rachel Powers
6b8fe283f0 fix: memory leak, set parent so it's in tree to get cleaned up. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:49:13 -07:00
leo78913
4f0ec908ec feat: add a close button to the main toolbar when running on gamescope 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-17 00:57:28 -03:00
Rachel Powers
bd1ea64d02
cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-16 00:01:52 -07:00
Rachel Powers
649753e97e cleanup: remove unneeded headers 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-15 16:40:56 -07:00
Rachel Powers
fc656b6927 fix: when given a remost resource, download and identify it before import. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-15 16:34:33 -07:00
Kode
3be18b58bb
Better variable name :p 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855 De-hardcode .index 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-15 18:48:49 +01:00
leo78913
7537ea1ef5 make instance settings account selector a comboBox 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-14 16:33:41 -03:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Trial97
8c7fd3327e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-14 14:20:04 +03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00
TheKodeToad
e1b6020b76 Make some changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:24:01 +01:00
Redson
79ce7eb1fc
fix: shouldDisplay() is now redundant. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-13 09:00:10 -03:00
Rachel Powers
b1ffc8ddab refactor: normalize url fn & cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 16:37:45 -07:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 01:13:17 -07:00
Rachel Powers
82287e0407 Merge branch 'develop' into curseforge-url-handle 2023-05-12 01:00:26 -07:00
Redson
37a6ef95f0
feat: Don't hide the settings tab when an instance is running 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-10 08:25:13 -03:00
Redson
475761b295
fix: Prism sets the data dir to the working directory. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-09 06:36:21 -03:00
Redson
0b251fa754
feat: Add the launcher root folder to the Folders menu 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-08 19:57:30 -03:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:21:21 -07:00
Trial97
ef6cbdfa2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-07 19:01:20 +03:00
Sefa Eyeoglu
ce5bb29c44
Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check 2023-05-06 09:54:59 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings 
fix: divide minecraftpage into tabs
 2023-05-06 08:28:46 +02:00
DioEgizio
d38696f411
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-05-06 07:15:14 +02:00
Rachel Powers
a3173b5371 fix: ensure Application accepts URLs and local files form cmd args 
refactor: Move curseforge:// url scheme detection to Import Page
feat: pass along extra CF pack info so pack metadata is established.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 15:05:17 -07:00
Rachel Powers
b266068644
Apply suggestions from code review 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:07:10 -07:00
Rachel Powers
74e7c13a17 feat: display license and issue tracker 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 13:46:38 -07:00