Michael Kamensky
532e6bee5b
Merge branch 'kevlahnota-master-patch-82009' into 'master'
...
fix typo
See merge request core-developers/forge!4744
2021-05-25 06:20:48 +00:00
Michael Kamensky
a7af611dfb
Merge branch 'rise' into 'master'
...
MH2: Rise and Shine and support
See merge request core-developers/forge!4745
2021-05-25 06:20:42 +00:00
Northmoc
de1296f750
add support for "RememberAnimated" to AnimateEffectBase
2021-05-24 22:06:55 -04:00
Northmoc
43e1c20046
rise_and_shine.txt
2021-05-24 22:06:55 -04:00
Anthony Calosa
b285205376
fix typo
2021-05-24 23:39:22 +00:00
leriomaggio
db4ec5eb07
Merge branch 'collector-number-in-card-list-and-card-db-refactoring' of git.cardforge.org:leriomaggio/forge into collector-number-in-card-list-and-card-db-refactoring
2021-05-24 21:10:19 +01: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
e57ab4cdb0
Updated missing collector numbers from scryfall
2021-05-24 21:04:39 +01:00
leriomaggio
c4d4a7f2c3
Resetting ImageFetcher to use collectorNumber as string
2021-05-24 19:37:25 +01:00
leriomaggio
66045abf16
Resetting ImageFetcher to use collectorNumber as string
2021-05-24 19:36:24 +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
tool4EvEr
f374466d0a
Update check for detecting prevented damage
2021-05-24 14:31:15 +02:00
tool4EvEr
97d9c57951
Update trigger so it doesn't resolve when card moved
2021-05-24 14:04:46 +02:00
leriomaggio
b651c1f9e9
Added CollectorNumberColumn to pileBy menu.
2021-05-24 11:49:05 +01:00
leriomaggio
d448b59dcc
Just code formatting
2021-05-24 11:48:22 +01:00
John
06ccc2d9c6
Update TypeLists.txt
2021-05-24 10:46:43 +00:00
John
bf2ee271fd
Add new file
2021-05-24 10:41:57 +00:00
John
b9486e8853
Add new file
2021-05-24 10:41:25 +00:00
John
7911f9bd20
Add new file
2021-05-24 10:40:46 +00:00
John
6753039b92
Add new file
2021-05-24 10:40:15 +00:00
John
802eff0796
Add new file
2021-05-24 10:39:48 +00:00
John
ff8141705d
Add new file
2021-05-24 10:39:20 +00:00
John
b28f8f50e1
Add new file
2021-05-24 10:38:41 +00:00
John
49a1f9527c
Add new file
2021-05-24 10:36:58 +00:00
John
240f5e6419
Add new file
2021-05-24 10:35:47 +00:00
tool4EvEr
2f26cbe676
Fix NPE
2021-05-24 12:24:15 +02:00
leriomaggio
2a304bd413
Made sorting on CN more reliable with zero-padded strings
2021-05-24 10:14:22 +01:00
leriomaggio
189b0ea122
Formatting adjustments
2021-05-24 10:13:40 +01:00
tool4EvEr
70b24f9b86
Fix Sen Triplets interaction
2021-05-24 10:55:51 +02:00
Anthony Calosa
6c11701032
Merge branch 'master' into 'master'
...
cleanup
See merge request core-developers/forge!4738
2021-05-24 08:24:21 +00:00
Anthony Calosa
d4a28c0e7b
uncomment
2021-05-24 16:23:23 +08:00
Anthony Calosa
0e50de91b4
cleanup
2021-05-24 16:22:09 +08:00
Anthony Calosa
ac78b96c2b
Merge branch 'master' into 'master'
...
[Mobile] Refactor preloading ItemPool
See merge request core-developers/forge!4737
2021-05-24 08:13:25 +00:00
Anthony Calosa
aca091e3c3
[Mobile] Refactor preloading ItemPool
...
Dont preload ItemPool on Android devices with less than 5GB RAM and Desktop/Mobile port
2021-05-24 16:09:40 +08:00
leriomaggio
572e7f5be8
Updated Card Edition Resources with Collector Numbers
2021-05-24 07:17:16 +01:00
tool4EvEr
ef4ab9570a
Clean up
2021-05-24 08:13:09 +02:00
Michael Kamensky
6207299219
Merge branch 'cleanup' into 'master'
...
Another few small non-functional changes to clean up some redundancy
See merge request core-developers/forge!4734
2021-05-24 03:29:07 +00:00
Michael Kamensky
8eb8c666b6
Merge branch 'hellkite' into 'master'
...
Refactor CardDamageHistory
See merge request core-developers/forge!4711
2021-05-24 03:28:58 +00:00
Bug Hunter
8f40e8ae04
Refactor CardDamageHistory
2021-05-24 03:28:57 +00:00
Michael Kamensky
b93131b990
Merge branch 'fixai' into 'master'
...
ChangeZoneAi: Fix casting without paying mana cost using X values
See merge request core-developers/forge!4735
2021-05-24 03:28:37 +00:00
tool4EvEr
6bce621da4
Fix Fires of Ivention
2021-05-24 00:42:34 +02:00
tool4EvEr
9e9bc5193f
Cleanup
2021-05-23 23:23:42 +02:00
tool4EvEr
178f937727
Fix AI casting without paying mana cost using X values
2021-05-23 22:45:46 +02:00
Michael Kamensky
d94abfaef9
Merge branch 'Williams-master-patch-16712' into 'master'
...
Update Resale Promos.txt
See merge request core-developers/forge!4733
2021-05-23 17:26:57 +00:00
leriomaggio
c03da7eb74
Revert to CollectorNumber in PaperCard as String to handle cases of mulitple art (e.g. 21a).
2021-05-23 16:52:12 +01:00
tool4EvEr
c39313d973
Clean up
2021-05-23 17:36:07 +02:00
leriomaggio
a0c126f39e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-05-23 14:50:49 +01:00
leriomaggio
354d184664
Display new collectorNumber info in Column List view for cards
...
This addresses Issue #1846
Further changes are due to CardEditions missing collector number information
2021-05-23 14:45:29 +01:00
leriomaggio
0e49d103b1
Update to the new getFoiledMethod in PaperCard API
2021-05-23 14:34:38 +01:00
