Leahnaya/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-25 16:32:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,826 Commits 45 Branches 167 Tags 133 MiB
bdb42bbbbd
Commit Graph

34 Commits

Author SHA1 Message Date
BruebachL
7f1d891e26
[Deprecation] Remove DBConverter from sources. (#6431)
Some checks failed
Build Docker Image / amd64 & arm64 (push) Waiting to run
Details
Build Desktop / Configure (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 11) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 13) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 12) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 43) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 42) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Servatrice_Debian, DEB, yes, skip, 11) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 24.04) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 22.04) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows10-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win10, win64_msvc2019_64, qtimageformats qtmultimedia qt… (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows7-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win7, win64_msvc2019_64, 5.15.*, windows-2022, 7, Release) (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (false, Ninja, macOS, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Apple, 15, Debug, 1, 16.4) (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS13_Intel-package, false, Ninja, 1, macOS, 13, -macOS13_Intel, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*… (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS14-package, false, Ninja, 1, macOS, -macOS14, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-14, Appl… (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS15-package, false, Ninja, 1, macOS, -macOS15, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Appl… (push) Has been cancelled
Details 
Took 10 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-12-20 15:25:13 +01:00
Zach H
d3a1538af3
Fix Windows Crash Reporter (#5493) 
* Fix Windows Crash Reporter

* Fix NSIS template
 2025-01-18 02:23:05 +00:00
Zach H
2ff99f12d8
Require Admin Permissions to install Cockatrice Windows (#5383)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 12) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 11) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 41) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 40) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 24.04) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 20.04) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 22.04) (push) Blocked by required conditions
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Blocked by required conditions
Details
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, 1, macos-14, Apple, 14, Release, 15.4) (push) Blocked by required conditions
Details
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, 1, macos-15, Apple, 15, Release, 16.2) (push) Blocked by required conditions
Details
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, macos-15, Apple, 15, Debug, 16.2) (push) Blocked by required conditions
Details
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (4, 1, macos-13, Intel, 13, Release, 14.3.1) (push) Blocked by required conditions
Details
Build Desktop / Windows ${{matrix.target}} (msvc2019_64, 5.15.*, 7) (push) Blocked by required conditions
Details
Build Desktop / Windows ${{matrix.target}} (msvc2019_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, 10) (push) Blocked by required conditions
Details 
Fix #5382
 2024-12-29 16:22:39 +00:00
Zach H
2bd06ff0fd
Add CrashDump support for Windows OS (#5282) 2024-12-21 18:52:07 +00:00
tooomm
872c92a244
CI: Use windows-2022 image with Visual Studio 17 2022 (#4999) 
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2024-05-13 17:41:50 -04:00
tooomm
03e109ef12 wait > sleep (#3806) 2019-09-05 15:44:14 +02:00
ctrlaltca
ada13f6578 Card Database converter (#3694) 
* Database converter

* Fix win compilation and NSIS installer

* Maybe fix windows again

* Re-fix windows
 2019-05-31 11:48:30 -04:00
ctrlaltca
638ee1af4a
This should fix appveyor compilation (#3434) 2018-11-12 18:50:38 +01:00
tooomm
c12c3c071f
NSIS: Show hint when user installs 32bit Cockatrice on 64bit Windows (#3331) 
* hint for 32bit

* final wording
 2018-07-17 07:40:45 +02:00
tooomm
d37d73017f
nsis: add sleep timer to ensure unlocking of vc_redist (#3325) 
* add 3s sleep + log hint
 2018-07-14 15:49:41 +02:00
ctrlaltca
b61c07a205
Check for both 32 and 64bit cockatrice when uninstalling (#3323) 2018-07-12 23:58:56 +02:00
ctrlaltca
dc727cb620
NSIS: misc fixes [wip] (#3300) 
NSIS: misc fixes
 2018-06-25 18:34:58 +02:00
tooomm
42d15c39a0 change vcredist install option from "/quiet" to "/passive" (#3175) 2018-04-07 12:32:20 -04:00
ctrlaltca
3a11aebb21
windows/appveyor compilation updates (#3020) 2018-01-17 18:20:05 +01:00
tooomm
04d84f9d9a repo cleanup (#2826) 2017-08-11 21:42:45 -04:00
ctrlaltca
1366e5970e Portable mode for windows (#2794) 
* Portable mode for windows

* fix start menu in portable mode

* Make gcc an happy puppy

* Clean old installation if we are installing over an old portable mode installation

* Default to Desktop\CockatricePortable

* Settings dialog fixes

* wording
 2017-07-08 11:22:29 +02:00
ctrlaltca
3356b2ede7 Change version in about window and installer name (#2570) 
* Change version in about window and installer name

* Change version in about window and installer name

* Cmake get version updates

* dev snapshot format changed

* alignment changes
 2017-04-20 13:41:18 +02:00
Fabio Bas
1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
Fabio Bas
74fef04a57 NSIS: Add components sections on uninstall. 2015-06-25 17:43:33 +02:00
Fabio Bas
76422854a4 NSIS: default to INSTDIR\sounds directory 2015-05-14 15:36:29 +02:00
Fabio Bas
da5677080b NSIS installer improvements; refs #876 
* uninstaller: delete zlib1.dll (first issue in #876)
 * require the user to uninstall the old version before installing the
new one
 * use project-version as branding name (fourth issue in #876)
 2015-05-07 22:29:39 +02:00
woogerboy21
1b09b76eee Remove --debug-ouput on start menu shortcut 
Remove argument that if added by default with out having the proper configuration defined during compiling would cause cockatrice to not open properly.
 2015-04-20 23:28:10 -04:00
woogerboy21
40610997c2 Corrected NSIS template quoting 
There are extra quotes introduced into line #19 that causes the NSIS installer creation to fail.
 2015-02-04 15:30:38 -05:00
tooomm
de336384cd add oracle name at the end of installer 2015-01-29 22:34:53 +01:00
Gavin Bisesi
8dbb2d8e6f Merge pull request #364 from ctrlaltca/win32_openssl_cmake 
Deploy openssl libraries under win32
 2014-10-14 14:03:32 -04:00
Fabio Bas
ea622a7302 NSIS: uninstall openssl libraries 2014-10-10 17:22:39 +02:00
woogerboy21
692910f9f3 Servatrice Icon For Windows 
Servatrice icon now gets created in windows start menu.
 2014-10-09 15:25:06 -04:00
Fabio Bas
85a4a94ba3 win32: Avoid wiping server.log on upgrade 2014-10-02 23:26:25 +02:00
Fabio Bas
8b32e51cab win32 NSIS installer: uninstall servatrice* 
just avoid deleting servatrice.ini, if the user manually made one from
the servatrice.ini.example
 2014-10-02 22:46:46 +02:00
Fabio Bas
98e5211ad5 Fix oracle under windows 2014-09-15 16:15:27 +02:00
Fabio Bas
23b0a6c0df Windows + CPack: fix packaging 
Package the correct cpack’s temporary directory
 2014-07-12 01:38:00 +02:00
Fabio Bas
3509df76b7 Remove old version parsing from nsis script 2014-06-28 19:48:51 +02:00
Fabio Bas
fc5a193e0d NSIS: remove additional files on uninstall 2014-06-28 19:39:47 +02:00
Fabio Bas
fc24ffdec2 Cmake reorganization 
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
 2014-06-28 19:39:26 +02:00