Commit Graph

3490 Commits

Author SHA1 Message Date
tool4EvEr
9a58359563 Better fix for Kethis 2021-07-04 11:45:39 +02:00
tool4EvEr
c52a94bbfc Refactor for facedown 2021-07-03 00:48:05 +02:00
Lyu Zong-Hong
be40fce2c6 Implement Dungeon mechanism and related spoiled cards 2021-06-26 18:29:14 +09:00
Michael Kamensky
1af68d9212 Merge branch 'CollectorBoosters' into 'master'
Collector boosters

See merge request core-developers/forge!4913
2021-06-23 03:44:28 +00:00
friarsol
dc886b139a Add full availability of other booster types 2021-06-22 23:36:12 -04:00
friarsol
2619cca56f Add support for collector boosters 2021-06-21 21:44:54 -04:00
leriomaggio
5ba6f29ebb FIX ImageFetcher BackFace card check
Quick FIX to restore correct download of backface of cards using directly imageKey string pattern
2021-06-21 13:33:18 +01:00
Lyu Zong-Hong
6daf4ac78d Add remaining commander cards 2021-06-20 17:22:49 +09:00
Lyu Zong-Hong
afa6c9986a Use VAssignGenericAmount dialog to assign mana combo 2021-06-18 17:58:52 +09:00
Lyu Zong-Hong
dfecf5d40a Use VAssignGenericAmount dialog to assign DividedAsYouChoose values 2021-06-18 11:21:23 +09:00
tool4EvEr
001106ea7b Small fixes 2021-06-15 16:36:33 +02:00
Hans Mackowiak
9bdd4b9351 StaticAbilityPanharmonicon: add LastStateBattlefield to Trigger RunParams for stuff that destroys in sequence 2021-06-12 12:57:51 +00:00
Michael Kamensky
08454489b4 Merge branch 'net_decks' into 'master'
Net decks updates

See merge request core-developers/forge!4861
2021-06-12 08:28:02 +00:00
tool4EvEr
828d4e17c9 Add Ask AI button 2021-06-11 23:25:57 +02:00
paul_snoops
233c1f6d00 Merge branch 'master' into net_decks 2021-06-11 22:24:22 +01:00
Sol
dbe1683ba9 Merge branch 'zabaz' into 'master'
Zabaz: add Cause to ReplaceAddCounter

See merge request core-developers/forge!4863
2021-06-11 12:29:46 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
paul_snoops
df0b5362c2 Net decks updates 2021-06-10 20:09:40 +01:00
tool4EvEr
084476b8b0 Clean up 2021-06-09 18:43:34 +02:00
tool4EvEr
4b0c748eaf Fix Myr Battlesphere allowing you to tap for X = 0 2021-06-09 11:40:11 +02:00
tool4EvEr
cc8753b563 Small fixes 2021-06-08 23:17:55 +02:00
leriomaggio
7dfc48744c Merge remote-tracking branch 'upstream/master' into patch-imagefetcher-scryfall 2021-06-05 17:00:53 +01:00
leriomaggio
6f27a0db4d ImageFetcher now gets language code directly from CardEdition and not from current locale 2021-06-05 15:17:32 +01:00
Lyu Zong-Hong
ab31c8fa9d Implement missing cards with dividable shields for damage replacement effects 2021-06-05 18:20:02 +09:00
Michael Kamensky
f53e4495de Merge branch 'thrasta' into 'master'
MH2: Thrasta and "Trample over planeswalkers"

See merge request core-developers/forge!4824
2021-06-05 03:17:27 +00:00
tool4EvEr
ba9b4617f7 Better fix for manapool payment 2021-06-04 20:25:05 +02:00
Northmoc
60f98c84d5 make sure damage assign window pops up for trampling over planeswalkers 2021-06-04 13:00:21 -04:00
leriomaggio
9539060404 Merge remote-tracking branch 'upstream/master' into patch-imagefetcher-scryfall 2021-06-04 15:20:59 +01:00
leriomaggio
9f73524dd9 ImageFetcher now uses scryfallCode instead of testing URLs to fetch images. 2021-06-04 15:20:44 +01:00
tool4EvEr
1af8cee719 Fix crash on payment with Channel 2021-06-03 10:39:50 +02:00
leriomaggio
560d8ec5c0 Refactored duplicate code in StaticData w/ new getCardEdition method
StaticData now includes a new method, namely `getCardEdition` which looks for a CardEdition instance into editions and customeditions given an input set code.

This new method has been refactored and used throughout the new changes in Advanced Search and Filters.
2021-05-31 19:57:33 +01:00
leriomaggio
1ac28b5203 Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view 2021-05-31 19:25:20 +01:00
Bug Hunter
450d5b6144 Some card fixes 2021-05-31 11:10:11 +00:00
leriomaggio
01e51ecb73 Custom Editions are now included in Advanced Search Filters 2021-05-31 10:45:49 +01:00
leriomaggio
5858de4860 ColumnDef now includes Custom Editionsi in sorting 2021-05-31 10:36:11 +01:00
leriomaggio
1c950a8a57 ImageView now includes also CustomEditions in Sets Map
This fix solves an issue with Custom Editions appearing as "Other" in ImageView. The bug was due to customEditions not being included in sets map.
2021-05-29 23:43:47 +01:00
leriomaggio
5c2f62defa FIX Scryfall Download retrieval, that is robust with different set-codes.
Imagefetcher now tries MCI code first and if that's not working, tries other set codes until one matching scryfall will be found. If none, the not-working set will be recorded to avoid future computation, and returns.
2021-05-28 23:29:29 +01:00
Michael Kamensky
e77281cfb6 Merge branch 'patch-content-downloader-macos' into 'master'
FIX annoying bug increasing display brightness on macOS when starting content downloader

See merge request core-developers/forge!4768
2021-05-28 08:57:09 +00:00
leriomaggio
66cb1c28f7 Switched to F1 - should be less annoying than F2 2021-05-28 07:05:06 +01:00
leriomaggio
8d2d633f6d FIX and Impros to CardEdition, CardInSet and Reader
- Reader has a new updated regexp to deal with non-numerical collectorNumbers
- CardInSet have been now made sortable based on CollectorNumber.
To do so, collectorNumbers are transformed accordingly to allow for natural ordering (as expected) instead of lexicographic order.
- CardEdition now return cards (CardInSet) as sorted, to allow for correct artIndex matching when creating corresponding `PaperCard` instances.
Moreover, `compareTo` of card edition has been improved to also take into account set name (in cases of same release date).
2021-05-27 10:38:51 +00:00
leriomaggio
39ed24d133 FIX annoying bug increasing display brightness on macOS when starting content downloader 2021-05-27 11:26:28 +01:00
Michael Kamensky
35aaafeba6 Merge branch 'fires' into 'master'
Fix Fires of Invention

See merge request core-developers/forge!4736
2021-05-26 04:34:29 +00:00
leriomaggio
51e6b6c908 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-05-24 21:09:58 +01:00
leriomaggio
c4d4a7f2c3 Resetting ImageFetcher to use collectorNumber as string 2021-05-24 19:37:25 +01:00
leriomaggio
019af5d238 Robust sorting of CollectorNumber (as string) handling properly non-numerical nrs. and N.A.s 2021-05-24 15:50:54 +01:00
leriomaggio
d71d10a97f Improved translations for CollectorNumber in Italian and Spanish, and while at it...
...I got rid of duplication for the lblSet col, while also improving translations.
In particular, the "lblSetEdition" column was translated as the "Mistery column" (for some reason :D), whereas a second lblSet2 was instead defined and used, namely "the label tooltip for the Set Columndef".
On this note, this col was also mistranslated in ES, IT, DE - those are the language I could handle so far.
In fact "Set" was intended (and so translated) as "to set" instead as for "Expansion/Edition".
Corrected accordingly! :)
2021-05-24 15:02:25 +01:00
leriomaggio
b651c1f9e9 Added CollectorNumberColumn to pileBy menu. 2021-05-24 11:49:05 +01:00
leriomaggio
2a304bd413 Made sorting on CN more reliable with zero-padded strings 2021-05-24 10:14:22 +01:00
tool4EvEr
70b24f9b86 Fix Sen Triplets interaction 2021-05-24 10:55:51 +02:00