ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,236 Commits 4 Branches 5 Tags 40 MiB
develop
Commit Graph

53 Commits

Author SHA1 Message Date
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2" 
This reverts commit b4b9051793.
 2025-01-11 14:19:46 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Luna
1a02c19176 correct some instances of "fjord" to "shattered/shattered prism" 2025-01-11 13:00:30 -06:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Trial97
f7c3e08ac8
add prismlauncher to plist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 18:27:37 +03:00
Kenneth Chew
4787141698
Improved blocked mods dialog permissions prompt 
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:30:06 -04:00
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
03ad430699
Merge pull request #1537 from Trial97/warnings 2023-10-04 09:40:38 +02:00
seth
584e800279
fix: remove -Wextra-semi 
this flag is unavailable on gcc versions < 8. we could detect the
version of the compiler here, but i don't think we lose much in this
flags removal and this is a simpler option

Signed-off-by: seth <getchoo@tuta.io>
 2023-08-30 11:14:49 -04:00
Trial97
d3acac16e6
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:10:13 +03:00
Trial97
c94ee67077
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:16:00 +03:00
Rachel Powers
d7d2d9f612
chore: remove WARNINGS_AS_ERRORS 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Rachel Powers
7e0e1ec51d chore: add better default compiler warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-04 14:10:17 -07:00
timoreo
63c21c53af Added url handler for curseforge 
Signed-off-by: timoreo <contact@timoreo.fr>
 2023-05-05 15:05:17 -07:00
Ryan Cao
03b48554b1
fix(style): convert tabs to spaces 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-29 00:01:22 +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
flow
e259bffca6
Merge pull request #810 from Scrumplex/refactor-launcher-version 
Hide channel from version for tagged commits
 2022-07-12 07:46:46 -03: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
4e99da7b62
refactor: query Qt variables using ECM 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
e58158c3cd
feat: add Qt 6 support to CMake 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:14 +02:00
Sefa Eyeoglu
0f9260869b
chore: update Git CMake module 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 17:23:13 +02:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake 2022-06-14 14:44:49 +02:00
Kenneth Chew
7eb61a28be
Add build options for Sparkle updater 
Two new build options are added:

`MAC_SPARKLE_PUB_KEY`: the public key used to verify the signatures of the appcast
`MAC_SPARKLE_APPCAST_URL`: the URL where the `appcast.xml` is located

If the updater should be disabled on macOS, set either of these to an empty string.
 2022-05-19 15:16:37 -04:00
Kenneth Chew
80908efdcb
Fix indentation of macOS resources 2022-05-15 16:33:52 -04:00
Sefa Eyeoglu
0b38d878a1
fix: remove in-tree CMake modules where possible 2022-05-02 16:27:15 +02:00
Kenneth Chew
9462dd3ddc
Improve security by enabling hardened runtime for macOS 
This change also fixes a bug on recent versions of macOS where Minecraft mods that requested access to the microphone would silently fail.
 2022-04-19 11:36:03 -04:00
Philipp David
a89cbf116d
Allow disabling building of tests 2022-03-23 19:48:03 +01:00
swirl
1d8196e11a
More rebranding 
Closes: #39

Mostly done with rebranding now. We just need to translate some services
to PolyMC.
 2022-01-10 12:47:35 -05:00
Petr Mrázek
5b3dffce62 NOISSUE continue debranding... 2021-10-21 00:47:53 +02:00
Petr Mrázek
5f2d3f014a NOISSUE get rid of remaining tabs 2018-08-02 01:01:55 +02:00
Sergey Shatunov
4d68c1b509
GH-2291 Fix build with Qt 5.11+ 2018-06-02 17:22:43 +07:00
Petr Mrázek
166e5a03d6 NOISSUE rearrange build system 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
 2018-01-27 02:00:20 +01:00
Petr Mrázek
b0bfffcd90 NOISSUE revert to dumping all build artifacts to the root 
This fixes unit tests on Windows... Windows has no mechanism to set library lookup path.
 2016-05-01 03:49:46 +02:00
Petr Mrázek
771dd6f9ab NOISSUE reorganize unit tests to be placed next to the code they test. Nuke more dead tests. 2016-05-01 00:02:15 +02:00
Petr Mrázek
e8ba5dafc6 NOISSUE remove dead unit tests and reorganize CMake code related to unit tests 2016-05-01 00:01:39 +02:00
Petr Mrázek
1be7d57332 NOISSUE re/move some dead code and unused build system parts 2016-05-01 00:00:24 +02:00
Petr Mrázek
e0a9970d59 NOISSUE Revert "NOISSUE remove old BundleUtilities. 2014 called and wants its cmake scripts back." 
This reverts commit 8cf23bd5aa.
 2016-01-04 01:42:48 +01:00
Petr Mrázek
8cf23bd5aa NOISSUE remove old BundleUtilities. 2014 called and wants its cmake scripts back. 2016-01-03 22:49:31 +01:00
Petr Mrázek
5402acb3c6 GH-1360 add basic changelog based on github API, fix update dialog buttons 2015-12-28 05:36:17 +01:00
Petr Mrázek
143e24fa04 NOISSUE clean up some old cmake messes 2015-09-28 20:53:46 +02:00
Petr Mrázek
161dc66c2c GH-1052 try using c++1y on OSX 2015-06-06 21:00:37 +02:00
Petr Mrázek
678da0b639 GH-1052 switch over to C++14 everywhere 2015-06-06 19:56:51 +02:00
Petr Mrázek
95203df9ca It's a fatal error to not find the dependency checker tool. 2014-05-02 00:52:08 +02:00
Petr Mrázek
27732d66b4 Add a safety net for missing dumpbin.exe 2014-05-02 00:37:29 +02:00
Petr Mrázek
9d724e0fe4 Merge remote-tracking branch 'origin/feature_cmake_style' into develop 
Conflicts:
	CMakeLists.txt
 2014-04-21 23:33:00 +02:00
Jan Dalheimer
3f2152c14d Let travis build a clang version 2014-04-12 18:11:30 +02:00
Jan Dalheimer
a00fb1e8da Only use tabs for intendention 2014-04-09 15:41:49 +02:00
Petr Mrázek
17d4947b30 Merge remote-tracking branch 'origin/feature_dotcmake' into develop 2014-04-06 20:56:40 +02:00
Jan Dalheimer
eb246c4fa7 .cmake files to reduce "code" duplicate 2014-04-06 18:12:48 +02:00