0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,099 Commits 1 Branch 0 Tags 29 MiB
a13d3f4a38
Commit Graph

208 Commits

Author SHA1 Message Date
flow
c4c1e75de8
fix: use QPixmapCache only from the main thread 
It's a required condition.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-15 18:14:03 -03:00
fn2006
ef713cf414 Merge branch 'develop' of upstream into develop 2022-11-13 23:28:58 +00:00
Sefa Eyeoglu
fe94c3609e
fix: implement code review suggestions 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
173aed7fd8
chore: add REUSE headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
086304f7f2
feat: add initial Migration dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
ddfb449b28
fix: remove PolyMC data paths 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:27:13 +01:00
txtsd
fcb9733df0
Merge pull request #392 from PrismLauncher/max_ram_logic 2022-11-08 12:23:24 +05:30
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock 2022-11-06 00:00:47 +01:00
Sefa Eyeoglu
4af22d663a
Merge pull request #229 from ryanccn/macos-drag-n-drop 2022-11-05 11:17:21 +01:00
Sefa Eyeoglu
e4bd82190a
Merge pull request #149 from TayouVR/better-custom-themes 2022-11-05 11:16:41 +01:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop 2022-11-04 18:30:42 +01:00
Tayou
e9bfd43ff7
added requested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:04:36 +01:00
leo78913
3d11d044d2 add an option to lock the toolbars 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-02 20:33:02 -03:00
Santiago Cézar
0a0ce74105 add rory 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:06:27 -03:00
Tayou
a3f5ea3598
added suggested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
fn2006
44a5130926 Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism 2022-11-01 18:48:31 +00:00
Sefa Eyeoglu
63a3dd1919
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:58:09 +01:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:46 +01:00
DioEgizio
664d4e701e
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater 2022-10-31 11:31:47 +01:00
TheLastRar
fd099166c6 Fix: Check if Windows 10 before calling setDarkWinTitlebar() 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-10-30 20:49:56 +00:00
txtsd
392bf7a97b
Merge pull request #342 from fn2006/prism-svg-fix 2022-10-29 23:11:37 +02:00
fn2006
b142a6da5b fix hardcoded svg 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 16:42:37 +01:00
fn2006
0f581efda5 fix hardcoded svg path 2022-10-29 14:16:14 +01:00
flow
d40a18d6c5
Merge pull request #218 from getchoo/change-jars-path 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg 2022-10-24 22:51:30 +02:00
fn2006
ecade0f510 small fixes 2022-10-24 16:27:07 +01:00
fn2006
23e5773094 Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism 2022-10-24 16:24:36 +01:00
Ryan Cao
f35a30d371
oops 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 23:47:53 +08:00
Ryan Cao
a406aeb3ea
feat: register as zip/mrpack handler on macOS 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 20:51:46 +08:00
seth
4a2b25e841
fix: use correct variable for jars path 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:21 -04:00
seth
ba4af1a890
fix: make jars path specific to prism 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:20 -04:00
Hibi
1288b92615
Add argument to show instance window 2022-10-21 15:40:28 -03:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
Fayne Aldan
888a87463e
Add fallback for multimc.cfg 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-10-18 14:40:34 -06:00
flow
32cdfb871c
fix: add fallback for polymc.cfg 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-18 12:22:42 -03:00
Sefa Eyeoglu
6db3f68ae1
refactor: use correct data path 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 13:58:50 +02:00
Sefa Eyeoglu
3ac398ac49
fix: use display name in code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:50:27 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth 
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
Sefa Eyeoglu
6ebc9abb80
fix: update capabilities before first-run wizard 
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-06 14:46:13 +02:00
fn2006
11f97a78fe Merge branch 'develop' of https://github.com/PolyMC/PolyMC into rebase 2022-09-29 15:10:32 +01:00
Sefa Eyeoglu
11c44c676c
fix: remove unused MACOS_HINT 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:28:46 +02:00
Sefa Eyeoglu
1cdadafdf8
refactor: use QCommandLineParser instead 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:21:27 +02:00
jopejoe1
29dcb9d274 Added Launch Demo button. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
fn2006
761f20a3e2 Rebase changes into latest PolyMC 2022-09-15 11:51:36 +01:00
Sefa Eyeoglu
1ca2be0039
Merge pull request #982 from DavidoTek/windarkmode2 2022-09-14 13:17:17 +02:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve 
Some more UI / UX improvements to the mod downloader!
 2022-09-07 08:27:11 -03:00
Sefa Eyeoglu
8e3356f11a
Merge pull request #1034 from Scrumplex/detect-performance-features 2022-09-05 17:45:17 +02:00
Fintan Martin
763627ee65 Merge branch 'develop' of https://github.com/PolyMC/PolyMC into rebase 2022-08-22 11:58:41 +01:00
Sefa Eyeoglu
6e086eb808
Merge pull request #992 from Scrumplex/refactor-version 2022-08-20 12:50:25 +02:00
Fintan Martin
03923c9e87 Rebrand to PollyMC 2022-08-19 13:56:46 +01:00
fn2006
0170e8b177 Add Ely.by accounts (#17) 
* Initial Ely.by support

* Fix profile pictures for Ely.by

* Disable upload and delete skin buttons for Ely.by accounts

* Port UltimMC's authlib injector to PollyMC
 2022-08-19 12:22:38 +01:00
Sefa Eyeoglu
1175461030
refactor: switch to new versioning scheme 
The new versioning system is based on the versioning system used by the
GNOME Foundation for the GNOME desktop.

We are dropping the "major version" as defined by SemVer and move to a
version number with a most and least significant number.

The most significant number must be incremented, if there are new
features or significant changes since last major release.

Otherwise, the least significant number must be incremented, if there
are only minor changes since the last release. New features or
significant changes mustn't be introduced by a bump of the least
significant number.

If a minor change would introduce small user-facing changes (like a
message-box or slight UI changes), it could still be classified as a
minor change.
At the end of the day, a human shall decide, if a change is minor or
significant, as there is no clear line that would separate a "minor" and
a "significant" change in a GUI-application.

Definitions:

feature: New user-facing functionality
significant change: Something that changes user-facing behavior
minor change: Something that fixes unexpected behavior

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-12 14:22:24 +02:00
timoreo
1a5986abe0
Merge pull request #920 from flowln/metacache_fix 2022-08-11 07:32:43 +02:00
timoreo
a5da3db966
Merge pull request #1018 from Scrumplex/fix-infinite-auth-loop 2022-08-10 18:14:26 +02:00
Sefa Eyeoglu
68f3f98bc3
feat: detect GameMode and MangoHud's presence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
f873cd5b1a
refactor: store current capabilities 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
355762aa30
fix: emit abort in LaunchController 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-04 10:07:36 +02:00
Sefa Eyeoglu
be4fb65470
fix: Add root path detection on OpenBSD 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-03 21:14:32 +02:00
flow
7a95314e42
feat(ui): remember mod download dialog's geometry 
Makes it consistent with other modal dialogs.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:31 -03:00
DavidoTek
b4e8abd0ad feat: win32 enable dark titlebar for dark theme 
Signed-off-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>
 2022-07-26 23:25:17 +02:00
flow
c8a72c876d
fix: add missing HttpMetaCache entry for CF mods 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-16 21:25:29 -03:00
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services 2022-07-11 14:56:09 +02:00
Sefa Eyeoglu
b3b76d5d56
Merge branch 'develop' into feature/sparkle-mac 
# Conflicts:
#	.github/workflows/build.yml
 2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
4103948132
feat: track capabilities of application 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe
refactor: rename references to CurseForge to Flame 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used" 
This reverts commit 2ff0aa09e3.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
f1902a4471
Merge pull request #794 from Scrumplex/resolve-jars-dynamically 2022-07-06 17:40:09 +02:00
Jan200101
cad581388f
Add Performance related settings 
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-07-06 09:34:14 +02:00
Sefa Eyeoglu
474d77ac57
feat: resolve JARs dynamically 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 17:31:01 +02:00
Ezekiel Smith
9cc235cde0
Merge pull request #811 from jn64/fix/window-title 
Fix duplicate name in window title
 2022-06-27 01:13:58 +10:00
Ezekiel Smith
409c9bf9d2
Merge pull request #778 from Scrumplex/track-real-architecture 
Track real CPU architecture for instances
 2022-06-22 01:13:10 +10:00
jn64
4b6ddfb89b Add version to Qt applicationDisplayName 2022-06-18 20:00:28 +08:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used 2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
91301ec7fe
Merge pull request #632 from ryanccn/macos-app-heuristic 2022-06-12 10:46:49 +02:00
Ryan Cao
13b03e7e50
Update Application.cpp 2022-06-12 11:44:04 +08:00
Sefa Eyeoglu
2257c875f5
Merge pull request #708 from ryanccn/custom-user-agent 2022-06-11 10:53:58 +02:00
Sefa Eyeoglu
8a2e8ad953
feat: track real CPU architecture for instances 2022-06-11 10:48:58 +02:00
Ryan Cao
529fb07b42
I changed my mind 2022-06-10 15:18:47 +08:00
Ryan Cao
757fa1410c
Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-06-05 23:52:21 +08:00
Ryan Cao
4cecba8787
make $LAUNCHER_VER actually work 2022-06-04 22:59:57 +08:00
Ryan Cao
25ab121e42
feat: custom user-agent 2022-06-04 15:33:17 +08:00
Ryan Cao
9673dac22b
add more #ifdefs 2022-05-24 16:18:02 +08:00
Ryan Cao
0426149580
standard macOS app behavior 2022-05-24 13:35:01 +08:00
flow
e17b6804a7
fix: implement PR suggestions 
Some stylistic changes, and get hashes from the mod providers when
building the metadata.
 2022-05-23 14:43:09 -03:00
flow
4439666e67
feat: allow disabling mod metadata usage 2022-05-23 14:42:28 -03:00
dada513
f00dbdc215
Make Metaserver changable in settings 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Co-authored-by: flow <flowlnlnln@gmail.com>
 2022-05-22 21:35:20 +02:00
LennyMcLennington
de02deac98
Make if statement condition more readable 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-21 17:30:54 +01:00
Lenny McLennington
e2ad3b0183
Add migration wizard, fix migration from custom paste instance 
- Very basic wizard just to allow the user to choose whether to keep
  their old paste settings or use the new default settings.

- People who used custom 0x0 instances would just be kept on those
  settings and won't see the wizard.
 2022-05-21 17:30:19 +01:00
Lenny McLennington
caf6d02728
Change paste settings and add copyright headers 
- There's now a notice reminding people to change the base URL if they
  had a custom base URL and change the paste type (that was something I
  personally had problems with when I was testing, so a reminder was
  helpful for me).

- Broke down some of the long lines on APIPage.cpp to be more readable.

- Added copyright headers where they were missing.

- Changed the paste service display names to the names they are more
  commonly known by.

- Changed the default hastebin base URL to https://hst.sh due to the
  acquisition of https://hastebin.com by Toptal.
 2022-05-21 17:30:09 +01:00
Lenny McLennington
35f71f5793
Support paste.gg, hastebin, and mclo.gs 2022-05-21 17:28:22 +01:00
dada513
2847cefff7
Add cursefrog key override 2022-05-20 19:56:27 +02:00
Kenneth Chew
ea4ef1655b
Create SparkleUpdater class for access from Qt/C++ 
To actually get automatic updates going, all that needs to happen is that `SparkleUpdater` needs to be initialized.

The rest of the functions can be connected to elements in the UI.
 2022-05-19 15:16:37 -04:00
Sefa Eyeoglu
8e9f1bcf18
fix: remove unnecessary Qt version checks 2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
cd9e0e0cc0
fix: use own metacache base for modrinth icons 2022-05-16 20:17:19 +02:00
dada513
8110040f86
Merge pull request #511 from dada513/hide_java_wizard 
add hide java wizard toggle
 2022-05-01 08:48:37 +02:00
dada513
dac801c8ac
add hide java wizard toggle 2022-04-30 15:19:57 +02:00