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

7022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
92b2f463e3 Merge pull request #1474 from apix0n/develop 2023-08-02 12:08:34 +02:00
Apix
16e6a01881 fix: fix copyright year 
Signed-off-by: Apix <apix0n@outlook.com>
 2023-08-02 11:35:54 +02:00
Rachel Powers
81bc9e488f DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com> 
I, Rachel Powers <508861+Ryex@users.noreply.github.com>, hereby add my Signed-off-by to this commit: b4ae6e9774c535bf02b06325e6763d2d7ee02f21

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-01 20:27:39 -07:00
Rachel Powers
e64e4d7ef7 Fix: always false comparison 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-01 18:57:35 -07:00
Rachel Powers
f19e8dd086 Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-01 18:53:51 -07:00
Rachel Powers
b4ae6e9774 fix(compiler warnings): suppress omtimisation flag conflict warnings. leave optimisation to Byild type defaults 
- enable ASan for RelWithDebInfo builds
 2023-07-31 23:25:49 -07:00
Rachel Powers
5a9f780cf8 fix(FlameInstanceCreationTask): include Net::Apidownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:36:13 -07:00
Rachel Powers
2d1197f59f Merge branch 'develop' into refactor/net-split-headers-to-proxy-class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:26:20 -07:00
Sefa Eyeoglu
d8f2a1354f chore: update Nix docs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-31 19:16:32 +02:00
TheKodeToad
b572f75dba Merge branch 'PrismLauncher:develop' into icon-indexing 2023-07-31 14:40:27 +01:00
Rachel Powers
14e16db01e refactor(filelink): drop moved funciton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 16:02:37 -07:00
Rachel Powers
7091bc81c2 chore(rename): fix unfinshed renames from deshadow changes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:56:38 -07:00
Rachel Powers
1e947ca893 fix(flame creation task): import ApiDownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:42:15 -07:00
Rachel Powers
b9fe37aec1 Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:33:46 -07:00
Rachel Powers
5d68a4c992 fix: religate export zip to launcher app only 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(MMCZip): include QUrl

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(FileLink): drop FreeConsole

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(filelink exe): add console sources

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:24:50 -07:00
Rachel Powers
760b80934f fix(filelink exe): add console sources 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:22:18 -07:00
Rachel Powers
6d564628b7 fix(FileLink): drop FreeConsole 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:11:00 -07:00
Rachel Powers
f03924478b Merge branch 'fix/windows-console-attach' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

# Conflicts:
#	launcher/Application.cpp
#	launcher/CMakeLists.txt
#	launcher/filelink/FileLink.cpp
 2023-07-30 14:30:16 -07:00
Rachel Powers
7c1a465ec9 Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:19:31 -07:00
Rachel Powers
a7ef663735 fix(windows console): use new logic in FileLink exe 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:03:20 -07:00
Rachel Powers
186211244d refactor(windows console): move to external file 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 13:38:47 -07:00
Rachel Powers
5740ee0444 fix(windows console): properly bind windows console 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 13:38:47 -07:00
seth
945939ba68 chore(actions): add new labels to update-flake 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-30 04:46:44 -04:00
seth
9137721e8e Merge pull request #1461 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-07-30 04:45:10 -04:00
Sefa Eyeoglu
566425166b Merge pull request #1449 from Trial97/tehnic 
Reintroduce parsing of INI files
 2023-07-30 09:47:40 +02:00
github-actions[bot]
d1513732be chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
  → 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
  → 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
 2023-07-30 00:20:33 +00:00
ashuntu
1467072f3d Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap 2023-07-28 16:25:32 -05:00
Ash
d133b40b25 Merge branch 'PrismLauncher:develop' into develop 2023-07-28 21:22:35 +00:00
Trial97
c3eb17db74 removed unneded if condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:22:04 +03:00
Trial97
4789708cc2 added missing ) 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:16:57 +03:00
Alexandru Ionut Tripon
83fce74bb1 Update launcher/ui/dialogs/NewInstanceDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-28 13:11:56 +03:00
Trial97
fcac98b367 removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 10:05:22 +03:00
Trial97
97ff7afbe7 keep the icon suffix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 08:37:45 +03:00
Trial97
7e58b965b7 refactor icon list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
1ca7e5efe9 added license header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
d460986de0 format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Sefa Eyeoglu
bdec11c501 Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846 refactor: introduce internal Launcher_ENABLE_UPDATER variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-27 09:37:56 +02:00
seth
51bfda937d chore: don't include sparkle when not enabled 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-27 02:19:21 -04:00
LostLuma
4a9ea832ff Ignore cache files entirely, also apply to modpack export 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-27 01:42:14 +02:00
seth
a8498b0dab chore: make INSTALL_BUNDLE a cached variable 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:03:14 -04:00
seth
48e5040196 feat: disable sparkle when update url is empty 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:01:39 -04:00
seth
928e18b66d Merge pull request #1446 from getchoo/nix-fixes 
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
 2023-07-26 17:10:07 -04:00
Trial97
62aa7a52c4 fiexed conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 2023-07-27 00:05:59 +03:00
Sefa Eyeoglu
d960effb99 Merge pull request #1447 from getchoo/typomoment 
fix: typo in task.h
 2023-07-26 22:56:31 +02:00
Trial97
1e82cb6a7c fix: add support for QByteArray inifile 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 23:56:01 +03:00
Alexandru Ionut Tripon
31b62203a7 Update launcher/ui/MainWindow.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-26 23:44:35 +03:00
seth
af59c41713 fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
seth
f7ffbcca6c chore(docs): correct markdownlint warnings 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 14:49:09 -04:00