0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,005 Commits 1 Branch 0 Tags 29 MiB
695734636f
Commit Graph

5005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml 2022-11-05 11:09:51 +01:00
Sefa Eyeoglu
bdac2a5f4d
fix: add missing newline 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-05 11:09:35 +01:00
Sefa Eyeoglu
5e9b26dbef
Merge pull request #366 from TheLastRar/MSVC-Build 2022-11-04 23:49:54 +01:00
TheLastRar
396a7994f9 Workflow: Add MSVC Builds to release workflow 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
e29259cd55 Fix: Resolve ambiguous overload errors 
Clang-cl fails to select the correct function and instead errors

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
79a728d7d2 Fix: Conflicting types for hoedown functions 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
98444bd865 CI: Add VC variables before packaging on Windows 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
3f75e1cb1d CI: Build MSVC Legacy as 32bit 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
4f327120ac CI: Link to release libraries even in debug 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
cc8456ec6b CI: Use msbuild generator for msvc builds 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:38 +00:00
TheLastRar
f8ad1a052f CMake: Support multi-configuration generators 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:38 +00:00
TheLastRar
372ce588cd CI: Add MSVC Builds 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:38 +00:00
TheLastRar
12632ec404 CMake: Build flags for MSVC 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:37 +00:00
TheLastRar
e777c26a14 CMake: Add fallback to bundled ECM 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:37 +00:00
TheLastRar
1d38248194 Libraries: Add ECM 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:36 +00:00
TheLastRar
d52868c6c5 CI: Exclude zlib tests 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:36 +00:00
TheLastRar
29c1639b1d CMake: Force bundled zlib to take our IPO settings 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:36 +00:00
TheLastRar
653a953d2f CMake: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:35 +00:00
txtsd
8f045af867
Merge pull request #374 from flowln/fix_lto 2022-11-04 15:39:41 +05:30
TheLastRar
6d4efc0443 Libraries: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
TheLastRar
e2e6d00064 CMake: Remove CMP0020 OLD 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
TheLastRar
e682c3e9b8 Fix: Correct exclusions for debug QT plugins 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
TheLastRar
fe347262e9 Fix: Using uint8_t in std::uniform_int_distribution is undefined 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:27 +00:00
TheLastRar
c993209b76 Fix: Explicitly specify Version.h path 
MSVC uses a different search mechanism that ends up picking the mete Version.h

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:27 +00:00
Sefa Eyeoglu
2cf4d5f8ec
Merge pull request #389 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2022-11-03 21:58:29 +01:00
renovate[bot]
c6ab9718ae
chore(deps): update hendrikmuhs/ccache-action action to v1.2.5 2022-11-03 19:50:27 +00:00
txtsd
3e3ef03855
Merge pull request #379 from TheLastRar/win-stacksize 2022-11-03 10:52:36 +05:30
flow
2958ffa73f
Merge pull request #382 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2022-11-02 16:50:47 -07:00
renovate[bot]
7eb0b1c69a
chore(deps): update hendrikmuhs/ccache-action action to v1.2.4 2022-11-02 23:02:32 +00:00
TheLastRar
8d39a9ea61 Fix: Increase stack size on Windows to 8MiB 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-02 20:13:44 +00:00
Sefa Eyeoglu
094b57bb23
Merge pull request #372 from santiagocezar/rory 2022-11-02 12:06:08 +01:00
Santiago Cézar
9ca4f19aea remove logcat 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-02 07:45:43 -03:00
txtsd
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha 2022-11-02 10:38:26 +05:30
Santiago Cézar
48d34741f3 keyboard navigation is important 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 22:53:45 -03:00
Santiago Cézar
76203018e9 forgot the qrc 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 20:21:34 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Santiago Cézar
668342b470 add rory flat too (and holiday variants) 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:31:37 -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
Sefa Eyeoglu
f6a3fa55b1
Merge pull request #368 from PrismLauncher/credits 2022-11-01 21:56:26 +01:00
txtsd
718a9a3559
change: Update credits 
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team

Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-02 01:20:58 +05:30
Sefa Eyeoglu
5485c5aaed
Merge pull request #365 from Scrumplex/fix-logo 2022-11-01 20:34:23 +01:00
Sefa Eyeoglu
b142e2a7a7
fix: fix logo name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-01 13:59:11 +01:00
timoreo
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 09:56:16 +01:00
timoreo
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 09:55:43 +01:00
DioEgizio
35edea2141
Merge pull request #359 from Chrono-byte/develop 2022-11-01 08:17:14 +01:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:48 +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