gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
5,912 Commits 53 Branches 176 Tags
e2c89c2a1ac3a202fb9f17f9e92b7b4b93a2c9d4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RickyRisterandGitHub 34a5b8b9ce [SettingsManager] Make setting getters const (#6748) 
* [SettingsManager] Make setting getters const

* remove hashGameType from header
 2026-03-27 18:13:25 +01:00
RickyRisterandGitHub 74cce5ccb2 [SettingsManager] Properly handle multithreaded access (#6747) 2026-03-27 17:12:49 +01:00
RickyRisterandGitHub bc219191db [Game] Refactor options in DlgMoveTopCardsUntil into struct (#6718) 2026-03-22 12:32:42 +01:00
RickyRisterandGitHub 38c85e6db1 [Dialog] Reduce spacing in create local game dialog (#6719) 2026-03-18 10:24:34 -07:00
RickyRisterandGitHub c5cd7d8700 [ShortcutsSettings] Fix duplicate aPlay shortcut; change play shortcut's group (#6716) 
* [ShortcutsSettings] Fix duplicate aPlay shortcut; change play shortcut's group

* update description
 2026-03-18 10:13:36 +01:00
RickyRisterandGitHub 33d5721490 [Game] Fix not using zone-specific card menu for opponent's cards (#6695) 2026-03-14 11:41:38 +01:00
RickyRisterandGitHub 20ad9af989 [CacheSettings] Refactor country list creation (#6687) 2026-03-12 11:00:32 -07:00
RickyRisterandGitHub e79bbc67b9 [DeckEditor] Fix undo/redo clearing legality (#6675) 2026-03-08 15:57:39 -07:00
RickyRisterandGitHub 15a1d5440b [DeckEditor] Fix undo/redo resetting deck sorting (#6673) 2026-03-08 23:50:54 +01:00
RickyRisterandGitHub 2f10634ca2 [DeckList] Fix double-faced cards not importing correctly (#6665) 
* [DeckList] Fix double-faced cards not importing correctly

* make tests compile
 2026-03-06 11:48:17 -08:00
RickyRisterandGitHub dead993639 [DeckList] Refactor load from plaintext to take normalizer as param (#6664) 
* [DeckList] Refactor load from plaintext to take normalizer as param

* update usages

* weaken unit test

* weaken unit test more

* revert unit test

* move CardNameNormalizer to libcockatrice_card

* update unit test

* formatting
 2026-03-06 10:39:04 -08:00
RickyRisterandGitHub 1bcea27a44 [Game] Add face down versions of move cards from library actions (#6661) 
* implement actions

* add new actions to menu

* update shortcuts
 2026-03-04 18:19:41 -08:00
RickyRisterandGitHub e7a3ad86eb [Game] Refactor move cards from library actions (#6658) 
* refactor move top/bottom cards actions

* minor cleanup

* translate zone display names
 2026-03-04 15:00:18 +01:00
RickyRisterandGitHub 846ecb7e8d [Client] Support face-down cards in all public zones (#6602) 
* [Server] Support face-down cards in all public zones

* add null check

* Check using zone names instead

* add comment

* Rename properties and only pass forceFaceDown

* [Game] Refactor CardDragItem faceDown logic

* revert refactor

* leave face_down unset unless forced

* [Client] Support face-down cards in all public zones

* leave face_down unset unless forced

* log face down

* update remaining logs
 2026-03-03 23:19:26 +01:00
RickyRisterandGitHub 2fba5dcd20 [Game] Refactor CardDragItem faceDown logic (#6552) 
* Rename properties and only pass forceFaceDown

* [Game] Refactor CardDragItem faceDown logic

* revert refactor

* leave face_down unset unless forced
 2026-03-03 23:18:21 +01:00
RickyRisterandGitHub 2828854d32 [Server] Support face-down cards in all public zones (#6539) 
* [Server] Support face-down cards in all public zones

* add null check

* Check using zone names instead

* add comment
 2026-03-03 23:17:35 +01:00
RickyRisterandGitHub 12c667afd7 [Search] Fix OR usage in examples (#6628) 2026-02-24 01:34:23 +01:00
RickyRisterandGitHub 2cb16c9fd0 [CardDatabaseDisplay] Reduce width by using icons (#6603) 
* [CardDatabaseDisplay] Reduce width by using icons

* use public domain filter svg icon
 2026-02-22 20:54:58 -08:00
RickyRisterandGitHub a90997353b [TabGame] Fix concede removing player without waiting for server (#6622) 2026-02-23 01:33:08 +01:00
RickyRisterandGitHub 0f2899b5c7 [DeckEditor] Alternate row colors in history list (#6626) 2026-02-22 22:11:10 +01:00
RickyRisterandGitHub f0da3cff40 [PictureLoader] Add hash of new gatherer card back image to blacklist (#6621) 2026-02-22 12:12:28 +01:00
RickyRisterandGitHub 5c3c3bfdba [ChatView] Fix extra blank line at beginning (#6613) 2026-02-21 15:36:35 +01:00
RickyRisterandGitHub 189f3a7bbc [ChatView] Fix game log first line incorrect background color (#6612) 2026-02-21 04:40:47 -08:00
RickyRisterandGitHub a7bb5254a3 [VDE] Fix Qt warnings in log (#6605) 
* [VDE] Fix Qt warnings in log

* fix button size
 2026-02-19 08:32:56 +01:00
RickyRisterandGitHub 88d0ebb12d [TabDeckEditor] Fix printingSelector dock close button not working (#6604) 2026-02-19 00:50:11 +01:00
RickyRisterandGitHub bdb42bbbbd [VDE] Separate layout settings for visual deck editor (#6595) 2026-02-08 13:37:56 -08:00
RickyRisterandGitHub ac7ff3a0e9 [LayoutSettings] Refactor how widgetSize settings are managed (#6594) 2026-02-08 05:07:53 -08:00
RickyRisterandGitHub 1eb6027443 clean up freeDocksSize in tabs with dockWidgets (#6593) 2026-02-08 05:07:40 -08:00
RickyRisterandGitHub edc8691731 [LayoutSettings] Don't return by const value (#6592) 
* [LayoutSettings] Don't return by const value

* fix compile failure
 2026-02-07 20:42:23 -08:00
RickyRisterandGitHub 804a60f1ea [LayoutSettings] Move over layout settings in global.ini (#6587) 
* [LayoutSettings] Move over some settings from general

* remove unused setting
 2026-02-07 19:51:12 -08:00
RickyRisterandGitHub 24bc713ba8 [DeckListModel] Fix deck hash not updating on card node add/remove (#6584) 2026-02-07 21:47:50 -05:00
RickyRisterandGitHub 8d7535c039 [LayoutSettings] Reorganize hierarchy in settings file (#6586) 
* [LayoutSettings] Reorganize hierarchy in settings file

* rename stuff since we're moving settings later
 2026-02-07 21:45:33 -05:00
RickyRisterandGitHub 32aa60bb14 [Oracle] Move oracle settings to separate file (#6588) 2026-02-07 21:44:49 -05:00
RickyRisterandGitHub a096a0e3bb [VDE] Reduce spacing in deck view toolbar (#6591) 2026-02-07 21:43:41 -05:00
RickyRisterandGitHub c7249dfbd9 [PrintingSelector] Don't change font size (#6573) 
* [PrintingSelector] Don't change font size

* remove connection to slider

* update comments
 2026-01-28 09:39:54 -08:00
RickyRisterandGitHub 1b29e0bfa8 [PrintingSelector] Reduce spacing (#6574) 
* [PrintingSelector] Reduce spacing

* align top

* reduce spacing in flowLayout
 2026-01-27 20:50:46 -05:00
RickyRisterandGitHub 5cc5767c87 [CardInfoPictureWidget] Refactor constant fields to static const (#6575) 
* [CardInfoPictureWidget] Refactor constant fields to static const

* rename constants

* reformat

* comment out unused
 2026-01-27 20:50:19 -05:00
RickyRisterandGitHub 165c4ddd2a [PrintingSelector] Properly clamp text size to picture on load (#6576) 2026-01-27 20:49:54 -05:00
RickyRisterandGitHub c02cf5e89e [VDE] Fix crash from alt-click when card has unknown set (#6566) 2026-01-25 01:36:10 -08:00
RickyRisterandGitHub 3c48d92663 [DeckEditor] Show info in PrintingSelector dock when override printings enabled (#6554) 
* don't hide printing selector dock

* extract warning message to separate file

* create printing disabled info widget
 2026-01-24 02:20:16 -08:00
RickyRisterandGitHub 5a274fdbed [DeckListModel] Mark all cards in token zone as legal (#6551) 2026-01-23 02:35:36 -08:00
RickyRisterandGitHub bfeb3a7ca9 [DeckListModel] Refactor to use forEachCard in legality check (#6550) 2026-01-23 01:05:25 -08:00
RickyRisterandGitHub d363ec5154 [VDS] Fix crash when tab is opened before card database is loaded (#6553) 2026-01-23 09:58:46 +01:00
RickyRisterandGitHub 999733fc0f [VDE] Fix right click to remove card not working (#6549) 
* fix typo

* fix crash
 2026-01-23 09:18:05 +01:00
RickyRisterandGitHub 8d274c1924 [DeckListModel] Correctly refresh legality on add card (#6537) 2026-01-22 23:34:24 -05:00
RickyRisterandGitHub 2e1a0bec93 [CardInfo] Refactor: add getLegalityProp method (#6536) 2026-01-22 23:33:21 -05:00
RickyRisterandGitHub 39ddaa0c35 [VDS] Reload deck on hover if file has been modified since last load (#6507) 
* add reload to DeckLoader

* [VDS] Reload deck on hover if file has been modified since last load

* fix version incompatibility
 2026-01-22 23:31:39 -05:00
RickyRisterandGitHub d9b9c79112 [VDS] Add option to hide color identity (#6533) 2026-01-19 00:38:48 -08:00
RickyRisterandGitHub 485d5a8b48 [DeckListModel] Fix exception precedence in legality check (#6535) 2026-01-19 00:28:13 -08:00
RickyRisterandGitHub f7e71a0868 [DeckList] Add optional restrictToZone param to getZoneNodes (#6534) 2026-01-19 00:27:58 -08:00
RickyRisterandGitHub af2995ba96 [VDS] Ignore tokens when calculating color identity (#6532) 2026-01-18 20:51:57 -05:00
RickyRisterandGitHub 792f077071 [VDE] Use splitter in sample hand widget (#6528) 
* [VDE] Use splitter in sample hand widget

* remove unused code
 2026-01-16 17:23:41 -08:00
RickyRisterandGitHub 9c07c7a963 [TabGame] Automatically sync view menu actions (#6529) 2026-01-16 17:22:48 -08:00
RickyRisterandGitHub d579c82cb9 [DeckLoader] Make save/load methods static (#6476) 
* const

* [DeckLoader] make methods static

* use static methods

* add docs

* add docs
 2026-01-16 13:20:36 -05:00
RickyRisterandGitHub c7c7bf550a [TabGame] Don't create replay dock if not replay tab (#6527) 
* [TabGame] Don't create replay dock if not replay tab

* use replayDock to determine if replay tab

* null check replayManager in dtor
 2026-01-16 09:45:10 -08:00
RickyRisterandGitHub 84483c56d7 [TabDeckEditor] Generalize visibility filter and extract it to a separate file (#6526) 
* create class

* use new class in old code
 2026-01-16 10:12:46 -05:00
RickyRisterandGitHub 1b71519ec6 [VDE] Make sample hand widget look nicer (#6525) 2026-01-16 10:11:39 -05:00
RickyRisterandGitHub 154b9ace92 [TabDeckEditor] Move cardDatabase dock action to top of menu (#6523) 2026-01-16 10:10:36 -05:00
RickyRisterandGitHub 93f0715d02 [TabDeckEditor] Save cardDatabase dock size in settings (#6524) 2026-01-15 21:54:50 -05:00
RickyRisterandGitHub 57e6c91689 [TabDeckEditor] Automatically sync view menu actions (#6522) 2026-01-15 21:05:19 -05:00
RickyRisterandGitHub c553e15036 [TabDeckEditor] Fix bug in #6499 causing view menu actions to sometimes not work (#6518) 
* remove a special case

* fix
 2026-01-14 14:20:12 +01:00
RickyRisterandGitHub 47720ff286 [ColorIdentityWidget] Refactor (#6506) 
* [ColorIdentityWidget] Refactor and add setter

* rename manaCost field

* nvm, just refactor for now

* use QtUtils

* move clearLayout into populate

* add back cardInfo constructor
 2026-01-14 02:41:03 -08:00
RickyRisterandGitHub 21d60ec3f1 Reduce padding in settings popup (#6504) 
* Reduce padding in settings popup

* reduce padding in PrintingSelectors settings

* reduce padding in one of the VDD filter settings
 2026-01-14 01:49:07 -08:00
RickyRisterandGitHub b19312be70 [TabDeckEditor] Consolidate dockWidget management (#6499) 2026-01-14 09:48:26 +01:00
RickyRisterandGitHub 0deaa9d9b4 [DeckEditor] Don't change widget focus when adding card (#6503) 2026-01-09 18:27:54 -08:00
RickyRisterandGitHub 7c7755b61d [VDE] Fix crash vy adding null check for card in PrintingSelector (#6500) 2026-01-06 22:41:40 -08:00
RickyRisterandGitHub 0a2fdb05ad [VDS] Try to fix memory leak by properly parenting widgets (#6498) 
* [VDS] Try to fix memory leak by properly parenting widgets

* format
 2026-01-06 11:42:35 +01:00
RickyRisterandGitHub 192dac0396 [DeckListModel] Consolidate methods and signals for card change (#6466) 2026-01-05 18:28:59 +01:00
RickyRisterandGitHub 85c9d8a9ff [DeckEditor] Fix tokens being added to maindeck (#6495) 2026-01-05 01:18:38 -08:00
RickyRisterandGitHub ee2699413c [TabDeckEditor] Make card database a dock widget (#6472) 
* [TabDeckEditor] Make card database a dock widget

* delete eventFilter implementation in abstract
 2026-01-05 00:06:22 -08:00
RickyRisterandGitHub d50297bbe6 [AnalyticsPanel] Use cogwheel icon for configure button (#6494) 2026-01-05 00:03:22 -08:00
RickyRisterandGitHub 489ce416c3 [VDS] Add search query option for comments (#6477) 2026-01-05 08:31:10 +01:00
RickyRisterandGitHub 731c487ccb [ServerGame] null check participant in getPlayer (#6493) 2026-01-05 01:43:40 -05:00
RickyRisterandGitHub 2d5e8deb75 [Server_AbstractParticipant] Rename bool getters (#6492) 
* [Server_AbstractParticipant] Rename bool getters

* reformat
 2026-01-05 00:34:32 -05:00
RickyRisterandGitHub 746f2af044 [DeckListModel] optimize by iterating over cardNodes instead of ExactCards (#6485) 
* [DeckListModel] optimize by iterating over cardNodes instead of ExactCards

* fix build failure

* another optimization

* fix build failure
 2026-01-03 19:19:04 -08:00
RickyRisterandGitHub f16c552d97 [PrintingSelector] Don't refresh display if "bump cards to top" is off (#6486) 2026-01-04 01:08:39 +01:00
RickyRisterandGitHub 4fbb9d9682 [PrintingSelector] optimize amount calculation (#6478) 2026-01-03 01:04:56 -08:00
RickyRisterandGitHub 84aefda486 [DeckListModel] add getCardNodes method (#6484) 
* [DeckListModel] add getCardNodes method

* Update one usage
 2026-01-02 18:55:27 -08:00
RickyRisterandGitHub bbd8671e6e [DeckDockWidget] Fix VDE crash due to not mapping proxy index (#6479) 2026-01-02 14:32:22 +01:00
RickyRisterandGitHub 84e6907fa9 [DeckList] Store sideboardPlans by value to fix crash (#6475) 2026-01-02 09:10:41 +01:00
RickyRisterandGitHub 93a4647b04 [DeckList] move SideboardPlan into separate file (#6474) 2026-01-01 16:24:47 -08:00
RickyRisterandGitHub 987fe9c9e2 [DeckDockWidget] clean up grouping and format sync (#6467) 
* [DeckDockWidget] clean up grouping and format sync

* refresh legalities in rebuildTree

* extract applyActiveGroupCriteria

* Fix build failure
 2025-12-31 23:35:43 -08:00
RickyRisterandGitHub b2dd8eed3f [TabDeckEditor] Create class to centralize deck state (#6459) 
* create new file

* use QSharedPointer in DeckListModel

* [TabDeckEditor] Create class to centralize deck state

* delete method

* update docs
 2025-12-31 17:54:47 +01:00
RickyRisterandGitHub db3bdb586b [CardInfo] clean up signatures (#6462) 2025-12-31 04:13:32 -08:00
RickyRisterandGitHub d722b2569c [DeckListModel] Refactor: general code cleanup (#6460) 
* change one usage

* move method

* move format check code

* make group criteria method static

* move method

* make method private

* more comments
 2025-12-31 12:01:49 +01:00
RickyRisterandGitHub 968be8a06f Fix bug with next/prev buttons in PrintingSelector (#6453) 
* Hacky fix and debug messages

* remove debug

* add todo
 2025-12-31 12:00:23 +01:00
RickyRisterandGitHub daa7db7ce3 [DeckDockWidget] Fix tree unexpanding when changing group by (#6458) 2025-12-29 22:43:34 -08:00
RickyRisterandGitHub cb2cf31cec [DeckListModel] Clean up recursive updates (#6457) 2025-12-29 22:13:34 -08:00
RickyRisterandGitHub 296866a675 [DeckListModel] Refactor api for offset count (#6454) 2025-12-29 17:19:03 +01:00
RickyRisterandGitHub 96c82a0377 [Refactor] Clean up some PrintingSelector widgets (#6451) 
* remove currentZone from PrintingSelector

* don't store constructor args in fields if they're just passed

* simplify some methods

* refactor

* clean up initializeFormats

* more refactoring in CardAmountWidget
 2025-12-29 12:03:44 +01:00
RickyRisterandGitHub ca3f6bba02 [Refactor] Move prev/next card logic out of PrintingSelector (#6450) 2025-12-26 13:29:35 +01:00
RickyRisterandGitHub 70f9982c29 Bump minimum Qt version from 5.8 to 5.15 (#6442) 
* Bump minimum Qt version from 5.8 to 5.15

* remove version check

* remove version checks
 2025-12-23 09:58:23 -08:00
RickyRisterandGitHub 421d6b334a [DeckDockWidget] Correctly handle auto-expanding tree (#6446) 
* move method

* remove expandAll calls

* update recursiveExpand

* Refactor DeckModel access

* [DeckDockWidget] Correctly handle auto-expand
 2025-12-23 16:21:47 +01:00
RickyRisterandGitHub 01e8e4d589 [DeckDockWidget] Fix swap not auto-expanding tree (#6443) 2025-12-23 15:45:27 +01:00
RickyRisterandGitHub be17ee1902 [DeckListModel] Refactor to use column num constants (#6441) 2025-12-23 06:07:39 -08:00
RickyRisterandGitHub e80f13b78e [DeckDockWidget] Refactor to move down some methods in AbstractTabDeckEditor (#6444) 
* move actSwapCard down

* rename method

* move actAddCard down
 2025-12-22 05:48:55 -08:00
RickyRisterandGitHub c12f4e9d2a [DeckListModel] remove more access to underlying decklist for iteration (#6436) 
* [DeckListModel] remove more access to underlying decklist for iteration

* remove one last direct iteration of decklist
 2025-12-21 16:19:57 -08:00
RickyRisterandGitHub a0f977e80c [DeckList] refactor: pass DeckList by const ref (#6437) 
* [DeckList] refactor: pass DeckList by const ref

* Change getDeckList to return a const ref
 2025-12-21 16:19:33 -08:00
RickyRisterandGitHub d6db21419c [Refactor] Pass around LoadedDeck instead of DeckLoader (#6422) 2025-12-20 13:39:00 +01:00
RickyRisterandGitHub 367507e054 [DeckListModel] Refactor: Don't access underlying decklist for iteration (#6427) 
* [DeckListModel] Refactor: Don't access underlying decklist for iteration

* add docs

* extract method
 2025-12-20 13:25:30 +01:00