jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 04:50:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
Cockatrice/libcockatrice_card/libcockatrice/card
History
Lukas Brübach f154335f5c Merge upstream/master into scryfall-tagger-tags 
Conflict resolution: keep both the tag database and the upstream database writer in the oracle test targets and both includes in the importer test; restore the tags.svg resource entry that the rerere replay dropped.

Upstream's icon rules also landed mid-branch: use loadThemedIcon() for the tag quick-filter button and re-author tags.svg as a 24x24 currentColor icon so IconAssets.AssetsFollowTheRules passes.
2026-11-08 20:44:00 +01:00
..
database Merge upstream/master into scryfall-tagger-tags 2026-11-08 20:44:00 +01:00
format [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
import [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
printing [CardDB] Stream card properties from blobs (#7608) 2026-10-24 00:17:31 +02:00
relation [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
set [CardDB] Break the CardInfo <-> CardSet cycle on reload (#7645) 2026-10-31 19:37:15 +01:00
card_info.cpp [Client] Added an exclude and color identity filter for the visual database display (#7587) 2026-11-05 12:40:32 +01:00
card_info.h [Client] Added an exclude and color identity filter for the visual database display (#7587) 2026-11-05 12:40:32 +01:00
card_info_comparator.cpp [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
card_info_comparator.h [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
card_localization.cpp [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
card_localization.h [Tooling] Apply include-what-you-use across the tree (#7396) 2026-10-08 11:13:50 +02:00
game_specific_terms.h [Card] Import Scryfall Tagger tags from MTGJson 2026-11-02 21:22:39 +01:00
lazy_properties_hash.cpp [CardDB] Stream card properties from blobs (#7608) 2026-10-24 00:17:31 +02:00
lazy_properties_hash.h [CardDB] Stream card properties from blobs (#7608) 2026-10-24 00:17:31 +02:00