Commit Graph

136 Commits

Author SHA1 Message Date
fn2006
64b7562919 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2022-12-20 20:23:42 +00:00
Sefa Eyeoglu
52d06ed814
chore: move instance_icons.svg
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-29 20:07:00 +01:00
fn2006
ef713cf414 Merge branch 'develop' of upstream into develop 2022-11-13 23:28:58 +00:00
Rachel Powers
bb8ac9b99a changed name of file type association
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-11-11 05:46:41 -07:00
Rachel Powers
96008d3bb2 add -I import flag & don't clobber .zip assoc
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-11-05 08:07:58 -07:00
Rachel Powers
c05f744ec2 windows file association is *hard*
new macros!

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-11-05 08:07:58 -07:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop 2022-11-04 18:30:42 +01:00
Ryan Cao
4254c20eda
experimental: install mime info in CMake
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-02 23:28:42 +08:00
Ryan Bjb
413dd73a73
Possible fix to windows builds (#36)
Error logs show:
ERROR: Line 3: The value of attribute version in element assemblyIdentity is invalid.
this should fix it, as i copied the value from prismlauncher.
2022-11-02 15:12:50 +00:00
fn2006
53e1f96bea
attempt to fix windows builds 2022-11-02 10:23:33 +00:00
fn2006
66a98380d0 i fucked up the cherrypick 2022-11-01 20:24:40 +00:00
Sefa Eyeoglu
466f9c3ec7 fix: fix logo name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-01 20:08:46 +00:00
fn2006
37fc2d5d79 fix build 2022-11-01 18:50:45 +00: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
b142e2a7a7
fix: fix logo name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-01 13:59:11 +01:00
txtsd
392bf7a97b
Merge pull request #342 from fn2006/prism-svg-fix 2022-10-29 23:11:37 +02:00
fn2006
98891a036d use existing variables
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
2022-10-29 17:35:37 +01: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
Sefa Eyeoglu
9337ec6706
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:36:15 +02:00
Sefa Eyeoglu
177f17450a
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:35:48 +02:00
Sefa Eyeoglu
9ec7837275
Merge pull request #318 from TheLastRar/manifest-platform
Fix: Don't specify x86 in manifest
2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
549b5a6488
Merge pull request #231 from tobimori/patch-1 2022-10-28 21:34:59 +02:00
flow
2f5393b9d0
Merge pull request #281 from Scrumplex/fix-nsis-displayname 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
de3c336213
Merge pull request #184 from Chrono-byte/develop 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
6e94e9bff1
Merge pull request #148 from ZombieNub/prismlauncher-rename 2022-10-28 21:34:59 +02:00
flow
6d46081864
Merge pull request #100 from TheEvilSkeleton/improve-approachability 2022-10-28 21:34:59 +02:00
TheLastRar
b18466da84 Fix: Don't specify x86 in manifest
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-10-27 18:37:08 +01:00
Sefa Eyeoglu
318f657c31
Merge pull request #231 from tobimori/patch-1 2022-10-25 20:15:31 +02:00
tobimori
d9463620e6 move .app rename to packaging process, update mac copyright string
Signed-off-by: tobimori <tobias@moeritz.cc>
2022-10-25 09:34:07 +02:00
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg 2022-10-24 22:51:30 +02:00
Ryan Cao
eeb95f89e1
add .mrpack mime type
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-25 00:12:27 +08: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
Sefa Eyeoglu
74b98af8e5
fix: use display name in NSIS
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-24 12:43:13 +02:00
Sefa Eyeoglu
6a474a0125
fix: update icon generate script
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-24 11:18:53 +02:00
Ryan Cao
1a8de111a3
add linux support
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-22 23:46:53 +08:00
Hibi
5b75869c0b
Add --show to manual page 2022-10-21 16:10:03 -03:00
Chrono-byte
ece206b81c
Remove erroneous space
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20 15:22:04 -04:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20 15:14:26 -04:00
Sefa Eyeoglu
0e209dcb02
Merge pull request #148 from ZombieNub/prismlauncher-rename 2022-10-20 09:44:25 +02:00
Zeke
6f2d6425a2
update meta to not break flatpak
Signed-off-by: Zeke <ezekielsmith@protonmail.com>
2022-10-20 16:54:57 +10:00
IroncladLandship
c29e7477f0
Merge branch 'develop' into prismlauncher-rename
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
2022-10-19 19:21:08 -05:00
flow
86bbc7939c
Merge pull request #100 from TheEvilSkeleton/improve-approachability 2022-10-19 21:15:37 -03:00
Jackson Huffstutler
d7478c14fd Renamed inappropriate instances of "PrismLauncher" to "Prism Launcher"
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
2022-10-19 16:03:18 -05:00
TheEvilSkeleton
297c593edd
Improve approachability
Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net>
2022-10-19 15:10:35 -04:00
Sefa Eyeoglu
41032aaac2
Merge pull request #110 from Scrumplex/fix-nsis-shortcut 2022-10-19 14:28:36 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 13:08:23 +02:00
Sefa Eyeoglu
22365205f9
fix: use display name for NSIS
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 12:17:06 +02:00
Samisafool
8201d1df02
Rename
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-19 15:02:43 +05:30