100 Commits
Author SHA1 Message Date
ebbit1qandGitHub ae37762ee1 fix crash when pressing Back to results (#7043) 2026-07-16 11:06:18 +02:00
ebbit1qandGitHub 6be9cec6e2 do not save a const reference to the user data in the info dialog (#6974)
* do not save a const reference to the user data in the info dialog

* cmake format
2026-06-09 23:35:00 -07:00
ebbit1qandGitHub a9003be30f update version to 3.1.0 for subsequent beta releases (#6921) 2026-05-22 01:35:01 +02:00
ebbit1qandGitHub 40b947c1e7 fix cards attaching/transforming to the wrong card across players (#6909)
* fix cards attaching/transforming to the wrong card across players

* move comment
2026-05-19 12:26:17 +02:00
ebbit1qandGitHub 40cef0e436 fix resizing the visual card database loading more pages forever (#6884)
* fix resizing the vde loading more pages forever

* make near end of page const
2026-05-19 12:25:35 +02:00
ebbit1qandGitHub 20cd7ce73d fix arch compiling (#6895) 2026-05-16 19:39:34 +02:00
ebbit1qandGitHub 2c51054e77 update version number after update (#6853) 2026-05-08 20:40:39 -04:00
ebbit1qandGitHub 45ab2602c6 ensure judges are omniscient when not spectating (#6831) 2026-04-30 14:31:28 +02:00
ebbit1qandGitHub b1fe4c85d3 fix sending decks to tappedout (#6832) 2026-04-23 02:28:12 +02:00
ebbit1qandGitHub 501c4b96d4 clear all players when closing game tab (#6828)
this prevents issues caused by items in play when using the player
destructor in the wrong order
2026-04-21 08:09:20 +02:00
ebbit1qandGitHub 6ab947418c add an isEmpty method to printing info (#6805)
no reason, I just find it easier to understand
2026-04-21 01:26:08 +02:00
ebbit1q 655a8e52a1 update release name 2026-04-19 01:15:58 +02:00
ebbit1q db235ecae8 update version number to 3.0.0 2026-04-19 01:11:00 +02:00
ebbit1qandGitHub 77978c7178 stop prepending the adventure side (#6819)
the adventure side of adventure cards used to be the first entry in
mtgjson, at some point this changed to the second entry, better
reflecting its secondary nature, however cockatrice has hardcoded the
treatment of the card to assume the second part was the "main" part,
when implementing the treatment of prepare layout cards (#6792) I
copied the behavior over which was then already incorrect, this pr
removes the special treatment of this card layout bringing the result
back in line with expectation: the main part of the card provides the
main type used in cockatrice for sorting and behavior
2026-04-19 01:03:49 +02:00
ebbit1qandGitHub e918856fa4 clear player before removing it from the scene (#6817)
revert #6740
2026-04-18 12:50:53 +02:00
ebbit1qandGitHub f97864b72b set the minimum qt6 version to 6.4 (#6811)
* set the minimum qt6 version to 6.4

this will be separate from the qt5 removal after release

* add include for optional
2026-04-14 00:59:46 +02:00
ebbit1qandGitHub 338c56678a add workaround for windows11 theme (#6810) 2026-04-13 14:49:31 +02:00
ebbit1qandGitHub 2e10b2f5d5 make general settings scrollable (#6800) 2026-04-12 02:38:04 +02:00
ebbit1qandGitHub 92fe406c22 remove break statement when closing views (#6801)
it's possible that multiple views need to be closed
this is an oversight of #4570
2026-04-12 02:37:43 +02:00
ebbit1qandGitHub e977f123ce add ccache eviction for files older than 7 days (#6795)
* add ccache eviction for files older than 7 days

also clean up some of the scripts to be more internally consistent

* move name build into the docker container again

* remove one extra empty line [skip ci]

* allow canceling concurrent builds on master for both desktop and docker

* add ccache eviction age to macos as well
2026-04-11 19:18:12 +02:00
ebbit1qandGitHub 36aba81b1b adds eternal to prioritisation list (#6793) 2026-04-10 18:18:08 +02:00
ebbit1qandGitHub f9fb03b26b update all runners to use qt6.11 (#6794)
* update all runners to use qt6.11

* use aqt version directly from repo
2026-04-10 18:17:43 +02:00
ebbit1qandGitHub d2732ac742 fix prepare cards (#6792) 2026-04-10 13:42:05 +02:00
ebbit1qandGitHub 2d412bfe52 fix cardloading on qt5 (#6790) 2026-04-09 21:16:38 +02:00
ebbit1qandGitHub 3ec9ae9772 fix compiling on arch (#6768)
* fix compiling on arch

* redo all the logging in affected files
2026-04-05 21:52:46 +02:00
ebbit1qandGitHub 42bd8164a0 remove hardcoded white in vde banner widget (#6684)
* remove hardcoded white in vde banner widget

* set text color to white on higher opacities
2026-03-27 18:10:29 +01:00
ebbit1qandGitHub abf6e72ad1 add a nulcheck in the card item animation timer (#6740) 2026-03-27 18:08:51 +01:00
ebbit1qandGitHub aa85a39d6a expand local game life total limits (#6730) 2026-03-24 00:16:48 +01:00
ebbit1qandGitHub 69c046cca4 remove all separate storing of widget sizes, rely on geometry (#6712) 2026-03-16 23:38:47 +01:00
ebbit1qandGitHub e39bbd2b31 take default theme name from startup instead of using empty (#6663) 2026-03-06 00:19:10 +01:00
ebbit1qandGitHub b36ab66583 nullcheck printing's set in home tab background art crop (#6646)
* nullcheck printing's set in home tab background art crop

* set warning and properly set timer

* fix merge
2026-03-04 00:49:50 +01:00
ebbit1qandGitHub 566c876bdc fix scaling for background images on home tab (#6656) 2026-03-04 00:16:45 +01:00
ebbit1qandGitHub 43acac5f5d empty card info when switching back to theme background (#6657) 2026-03-04 00:16:19 +01:00
ebbit1qandGitHub e57ee8e9c9 fix set sorting (#6630) 2026-03-02 23:06:05 +01:00
ebbit1qandGitHub 485e4d56aa Update CONTRIBUTING.md (#6615)
I keep forgetting this so I'm making the warning bigger
2026-02-21 21:38:05 +01:00
ebbit1qandGitHub 6ab558dd58 reset style to the default instead of the first key (#6596) 2026-02-19 08:36:35 +01:00
ebbit1qandGitHub 5309dd17be fix typo (#6572) 2026-01-25 20:44:03 -05:00
ebbit1qandGitHub 0b4e7be596 followup to #6563 (#6569)
* mess with the font rendering of the home screen until it works

* add more fonts

* increase font weight

* fix outline on the text
2026-01-25 16:05:53 -05:00
ebbit1qandGitHub 303bd8b607 detect recursive redirects (#6570)
* detect recursive redirects

* handle failure with normal failure handler
2026-01-25 16:05:19 -05:00
ebbit1qandGitHub 92f02fa4ee mess with the font rendering of the home screen until it works (#6563)
* mess with the font rendering of the home screen until it works

* add more fonts
2026-01-25 01:37:19 -05:00
ebbit1qandGitHub 49e6cf95c4 fix package description (#6565) 2026-01-24 22:34:53 -05:00
ebbit1qandGitHub 8a126263a9 do not ignore return value of opening log in servatrice when rotating (#6564) 2026-01-24 15:05:26 -05:00
ebbit1qandGitHub afdb385770 move returning cards to server_game (#6561)
lock the game mutex instead of player mutex when returning cards
2026-01-24 12:54:29 -05:00
ebbit1qandGitHub 9f90de2242 change the release channel based on version string (#6447)
* change the release channel based on version string

* Apply suggestions from code review

* format
2025-12-31 17:55:31 +01:00
ce4a3bf118 compile in debug mode on ubuntu 22.04 (#6418)
* compile in debug mode on ubuntu 22.04

* Update card_info_display_widget.cpp

Use c++ instead of c-style cast

---------

Co-authored-by: BruebachL <44814898+BruebachL@users.noreply.github.com>
2025-12-30 00:16:02 -05:00
ebbit1qandGitHub 521046fb09 Hashing tests (#5026)
* add deck hashing tests

* format

* fix header

* fix cmakelists

* fix test

* add 5 second timeout to test

let the optimising begin

* expand tests

* remove debug message

* manually format

* I installed cmake format from the aur

* use decklist library

* format
2025-12-23 17:48:10 +01:00
ebbit1qandGitHub 65aef396fb do not allow other players to know which cards are in a player's hand (#6125) 2025-11-26 09:16:50 -05:00
ebbit1qandGitHub a21e45ed36 add phase to delete arrows in to protocol (#6159)
* protocol changes

* servatrice changes

* add new setting

* implement client side with static 4 phases

* reading the code explains the code

* add subphases to phase.cpp

* use new subphase definition
2025-11-26 09:16:10 -05:00
ebbit1qandGitHub 648f028a63 fix use of wrong parent when removing arrows for a player (#6308) 2025-11-12 04:48:26 +01:00
840ee1379f fix crash on force starting, kicking players (#6307)
* fix crash on force starting, kicking players

* Update server_game.cpp

---------

Co-authored-by: Zach H <zahalpern+github@gmail.com>
2025-11-12 04:44:58 +01:00
ebbit1qandGitHub c9ccab8771 Servatrice build failure (#6243)
* attempts to fix the problem

* add test to show the problem

* fix workflow

* move logger to cockatrice

* more attempts

* undo stuff

* mark different libraries as gui

* fix SC2145

* rename servatrice only build
2025-11-11 14:34:39 +01:00
ebbit1qandGitHub 0ad31fea46 allow oracle to run in background with direct xml downloads (#6241)
Took 5 minutes
2025-11-09 09:52:46 +01:00
ebbit1qandGitHub 6d75ce4b1c don't close dm tabs when disconnecting (#6285) 2025-11-08 20:06:54 +01:00
ebbit1qandGitHub d206a70b8a update format.sh (#6240)
* update format.sh

add shellcheck to format.sh
add statement macros to .clang-format
add no clang format to format.sh
add changed file list to format.sh diff
rename --cf-version to --print-version in format.sh
lint files

* enable --shell on ci runs

* remove useless semicolons

removes the semicolons after empty function definitions
these semicolons are optional, they don't do anything
this will have functions be consistently formatted
if we want to keep the option to have these on the same line like they
were before we should use the option AllowShortFunctionsOnASingleLine: None

* fix script

* update echo line in lint_cpp.sh which doesn't lint cpp only at all
2025-11-07 15:00:39 +01:00
ebbit1qandGitHub d914667238 fix qt 6.10 debug build (#6271)
* fix qt 6.10 build

* fix games model parameter order and correct parameter names

* add missing include for qt5
2025-11-05 12:10:36 +01:00
ebbit1qandGitHub be1403c920 add hdiutil repeat script (#6231) 2025-10-08 10:10:44 +02:00
ebbit1qandGitHub e1259e67d3 update vcpkg (#6230)
* update vcpkg

* trigger build workflow on vcpkg changes
2025-10-08 01:40:52 +02:00
ebbit1qandGitHub 3cff55b0bb add abstract player in expectance of draft players (#6210)
* add abstract player in expectance of draft players
2025-10-07 15:09:30 +02:00
ebbit1qandGitHub a69bfb8cb8 add scroll bar to properties in cardinfotextwidget (#6201)
* add scroll bar to properties in cardinfotextwidget

* remove resizeevent trigger
2025-10-02 22:55:18 -04:00
ebbit1qandGitHub e318815025 nullcheck concede action (#6193) 2025-09-28 23:03:13 -04:00
ebbit1qandGitHub 2a032f3116 remove building docker images on code changes in prs (#6192) 2025-09-28 18:44:35 +02:00
ebbit1qandGitHub f0c3860032 squash #6156 (#6161)
* move common server files

* update includes with move

* create participant, move code

* fix linker errors

* fix regressions

* mark function as override to make clang happy

* split out spectator to new file

* forgot to add to cmakelists

* autocompleter picking wrong casing for var name

* clean up forwards declarations in player

* fix includes in game
2025-09-20 14:37:12 +02:00
ebbit1qandGitHub 17dcaf9afa squash #6158 (#6160)
* move message_log_widget to game

* move files

* update headers

* fix cmakelists

* oracle fixes

* split implementation out to cpp

* fix recursive import

* fix main file

* format
2025-09-20 14:35:52 +02:00
ebbit1qandGitHub 216cd491cc fix #6115 (#6118)
* fix #6115

* rename all instances of player when relevant
2025-09-11 12:00:49 -04:00
ebbit1qandGitHub 5c16f0d027 update the address of the fsf in the license (#6113)
the fsf closed its office in august this year, it's now remote only and
the address has been replaced with its url, the license text can be
found here: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
2025-09-10 18:18:34 -04:00
ebbit1qandGitHub 1b4441baac add libqt6sql6-mysql to debian package recommends (#6110) 2025-09-08 09:59:18 -04:00
ebbit1qandGitHub 0147a1d41f disallow users on your ignore list to get your current games (#6109) 2025-09-07 11:58:52 -04:00
ebbit1qandGitHub 48b6e1590c increase cache size for ccache on linux ci (#5935) 2025-05-11 11:48:58 +02:00
ebbit1qandGitHub 6b39f6f6fa fix indenting in test cards.xml (#5866) 2025-04-20 14:36:38 +00:00
300a37a199 change settings entry of the cod conversion prompt to a combobox (#5801)
* change settings entry of the cod conversion prompt to a combobox

replace the two checkboxes of which one state is ignored if one is
checked with a three state combobox for better user experience

* Update dlg_settings.cpp

---------

Co-authored-by: Zach H <zahalpern+github@gmail.com>
2025-04-11 23:12:34 -04:00
ebbit1qandGitHub 351c77182c put multiple printings of the same dual face/split cards in the xml (#5823) 2025-04-11 23:02:48 -04:00
ebbit1qandGitHub 9463390e80 fix client crash when server goes down during registration (#5787) 2025-04-11 23:01:14 -04:00
ebbit1qandGitHub 69741d858c fix crash using uninitialised memory from #5228 (#5237) 2024-12-11 01:19:53 +00:00
ebbit1qandGitHub 4d394c31f9 fix the timezones used for the user info box and add comments (#5162) 2024-11-05 14:54:38 -05:00
ebbit1qandGitHub 230a2c5c62 fix crashes in local games because of using uninitialised pointers (#5147) 2024-10-26 21:03:32 +00:00
ebbit1qandGitHub 590fb7f533 fix row colors swapping when using back button in replays (#5148)
only happens when there is an uneven amount of rows in the chat
2024-10-26 21:02:51 +00:00
ebbit1qandGitHub 4865269a73 don't delete "" (#5135) 2024-10-19 13:06:18 +02:00
ebbit1qandGitHub bbe125beee replace cipt check with regex (#5094) 2024-08-25 00:31:01 +00:00
ebbit1qandGitHub e826e17c6c add qtimageformats module (#5092)
* add qtimageformats module

* add qt6-image-formats-plugins to apt depends in cmakelists

* too many quotes

* add qt6-qtimageformats to rpm deps
2024-08-16 22:32:22 -04:00
ebbit1qandGitHub ef4413633a fix regression in #4762 to _fill_with_ template (#5083)
fixes #5062
2024-07-29 01:20:50 +00:00
ebbit1qandGitHub f174614496 assign new arrow id when arrow is moved to transformed card (#5012)
* add timeout to settingscache

* assign new arrow id when arrow is moved to transformed card

fixes bug introduced in #4907
fixes #5008
2024-03-27 14:47:00 +01:00
ebbit1qandGitHub ad56b431a3 increase version number so we can create a beta (#5001) 2024-02-27 20:55:28 +01:00
ebbit1qandGitHub 9776ea53c9 make translation update script more specific in line selection (#4993) 2024-01-25 23:28:23 +01:00
ebbit1qandGitHub 1716801437 make package on macos 13 (#4961) 2023-12-15 21:15:57 -05:00
fa727524dc make cards on the stack slightly overlap to stress order (#4930)
* make cards on the stack slightly overlap to stress order

dragging cards to the stack now places the card at the location it is
dropped

* make default play action append to stack

* add vertical overlap to settings and vertical hand

* Update cockatrice/src/dlg_settings.cpp

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

* Fix format

---------

Co-authored-by: tooomm <tooomm@users.noreply.github.com>
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
2023-12-15 14:00:58 -05:00
ebbit1qandGitHub 28f80e18a0 add ctrl enter as shortcut for ok when setting annotation (#4929) 2023-12-15 13:55:11 -05:00
ebbit1qandGitHub 4acc8bfe80 put cards on top in a random order (#4960) 2023-12-15 13:51:21 -05:00
ebbit1qandGitHub 7b3617a273 clean up #4904 for consistency (#4927)
note, this is not a racetime issue, see #4907
2023-10-28 14:35:15 -04:00
ebbit1qandGitHub 6bf7c79891 copy arrows on transform (#4907) 2023-10-13 19:01:08 -04:00
ebbit1qandGitHub 7fb698cfbf update release template with #4883 deprecating 32 bit (#4885) 2023-10-02 14:09:19 -04:00
ebbit1qandGitHub 90679d5669 fix issues with #4648 (#4864) 2023-08-18 12:34:17 -04:00
ebbit1qandGitHub e3552fc0ae add more default shortcuts (#4349)
* add more default shortcuts

replace the ctrl a look at top of library shortcut with ctrl shift n
use ctl a for draw arrow
replace ctrl shift b for toggle sideboard lock
use ctrl b for move card to bottom of library
use ctrl shift l for start local game
add keyboard shortcuts for all 3 counter colors using , . / keys
use ctrl [ ] \ for the "other" counter
add ctrl = as an easy alternative to ctrl + for people without keypads
( on linux ctrl alt keypad + is a special key that is reserved in x
  it produces the XF86_Next_VMode keyboard event which isn't bindable )
use alt u for toggling untapping
use alt l for peeking at cards
use ctrl alt u for unattaching cards
use alt n for set annotation
use alt y for milling one card

* use alt f for flipping cards
2023-08-06 17:56:24 -04:00
ebbit1qandGitHub 244cb847fb replace trayicon activation with menu actions (#4632) 2023-08-06 17:55:02 -04:00
ebbit1qandGitHub 7c20e9ab34 add move cards from top of library until dialog (#4648)
a bit of a hack, the client will use the play top card action and then
compare it with the propmpted expression, as if you were cascading
normally but really fast

the new keybind for this is ctrl shift y

I have ratelimited the action to 10 cards a second
2023-08-06 17:53:07 -04:00
ebbit1qandGitHub cb52605928 use a regex to remove all reserved characters from file names (#4804) 2023-08-06 17:46:22 -04:00
ebbit1qandGitHub afb7c35cfd add a way to replace the user facing list of disallowed words (#4807) 2023-08-06 17:45:37 -04:00
ebbit1qandGitHub f269e5fe58 add fedora 38, scheduled to release next week (#4785) 2023-04-30 14:21:13 +02:00
ebbit1qandGitHub 70ab02987a save sets dialog size (#4791)
* save sets dialog size

* reset sorting when restoring

* add to gitignore
2023-04-29 23:10:59 -04:00
ebbit1qandGitHub 421da882d8 qt 6.5 compatibility (#4796)
* remove metatypes definitions

* deprecation of QApplication::setActiveWindow
2023-04-29 23:09:26 -04:00
ebbit1qandGitHub 9ce450d0b0 add _substr_[pos]_[len] to picture download templates (#4762) 2023-04-01 22:29:57 -04:00