Commit Graph

53781 Commits

Author SHA1 Message Date
Northmoc
959e67a240 weary_prisoner_wrathful_jailbreaker.txt 2021-10-29 16:40:47 -04:00
Northmoc
dc3a075f7c sigardas_summons.txt (Marvel) 2021-10-29 16:35:49 -04:00
Northmoc
2b5591adbd rot_tide_gargantua.txt 2021-10-29 16:28:17 -04:00
Northmoc
7b5d0477a9 voldaren_estate.txt 2021-10-29 16:22:57 -04:00
Northmoc
739dedc02d overcharged_amalgam.txt 2021-10-29 16:22:57 -04:00
Northmoc
3660e0798d sorin_the_mirthless.txt and token 2021-10-29 16:22:57 -04:00
Northmoc
7b76a33baf olivia_crimson_bride.txt (Suthro) 2021-10-29 16:22:56 -04:00
Northmoc
86463b1298 grolnok_the_omnivore.txt and counter 2021-10-29 16:22:55 -04:00
Michael Kamensky
086ee5f007 Merge branch 'vold' into 'master'
VOW: Voldaren Bloodcaster // Bloodbat Summoner + support

See merge request core-developers/forge!5675
2021-10-29 19:46:27 +00:00
Michael Kamensky
205bafdd8c Merge branch 'training' into 'master'
VOW: Training keyword and some cards

See merge request core-developers/forge!5665
2021-10-29 19:45:56 +00:00
Anthony Calosa
aa9ebe8daf Merge branch 'master' into 'master'
[Mobile] Display cards that cannot be imported on Deck Import Dialog

See merge request core-developers/forge!5679
2021-10-29 19:31:39 +00:00
Anthony Calosa
88dac20908 [Mobile] Display cards that cannot be imported on Deck Import Dialog 2021-10-30 03:30:06 +08:00
Northmoc
d38da4c149 Trains Trigger 2021-10-29 12:07:19 -04:00
Northmoc
d2453eb96c savior_of_ollenbock.txt 2021-10-29 12:07:18 -04:00
Northmoc
4c19a2b3f8 Training keyword support 2021-10-29 12:07:18 -04:00
Northmoc
8dac9454c4 token 2021-10-29 12:07:17 -04:00
Northmoc
3c81f7bde1 basic cards 2021-10-29 12:07:16 -04:00
Michael Kamensky
8c8193ca4c Merge branch 'typo' into 'master'
ghostly_touch.txt tidy

See merge request core-developers/forge!5677
2021-10-29 14:30:06 +00:00
Michael Kamensky
8fd1dc6d0b Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!5674
2021-10-29 14:21:35 +00:00
Northmoc
161bea7c0d ghostly_touch.txt 2021-10-29 10:21:21 -04:00
Northmoc
75e67df228 support "Whenever you create a X token" 2021-10-29 09:52:45 -04:00
Northmoc
ad107410ac voldaren_bloodcaster_bloodbat_summoner.txt 2021-10-29 09:51:34 -04:00
CCTV-1
2ec8630942 translate the newly added string. 2021-10-29 20:57:10 +08:00
Michael Kamensky
12831af604 Merge branch 'master' into 'master'
Minor tweak to FlipOntoBattlefieldEffect.

See merge request core-developers/forge!5673
2021-10-29 10:41:32 +00:00
Michael Kamensky
a46bed2629 - Minor tweak. 2021-10-29 13:41:04 +03:00
Michael Kamensky
2ecefa4921 Merge branch 'master' into 'master'
FlipOntoBattlefield: somewhat improve the chance to hit an attachment when targeting the card it's attached to.

See merge request core-developers/forge!5672
2021-10-29 10:40:26 +00:00
Michael Kamensky
b7a4175d61 - FlipOntoBattlefieldEffect: somewhat improve the chance to hit an attachment when targeting the card it's attached to. 2021-10-29 13:39:06 +03:00
Michael Kamensky
7a4423bc90 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-10-29 13:38:30 +03:00
Michael Kamensky
091ea87290 Merge branch 'afr-plane' into 'master'
Forgotten Realms plane for Planar Conquest

See merge request core-developers/forge!5503
2021-10-29 10:37:51 +00:00
Michael Kamensky
5f6987a016 - Added an event to the W region.
- Finished the W region.
- Slightly improved the Braids, Conjurer Adept Avatar AI logic.
2021-10-29 10:37:50 +00:00
Michael Kamensky
9a419ef97b Merge branch 'edition_updates' into 'master'
Crimson Vow edition updates

See merge request core-developers/forge!5671
2021-10-29 10:37:37 +00:00
paul_snoops
9903a274c2 CC2 date change 2021-10-29 11:22:37 +01:00
paul_snoops
1dcf336f83 Crimson Vow edition updates 2021-10-29 11:20:42 +01:00
Michael Kamensky
d4b4fc38a4 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-10-29 07:24:38 +03:00
Michael Kamensky
3c5182e15c Merge branch 'voc_28' into 'master'
VOC: 28 Oct

See merge request core-developers/forge!5669
2021-10-29 04:15:45 +00:00
Northmoc
739bb6416e Wedding Ring trigger support 2021-10-28 22:36:10 -04:00
Northmoc
3bf3f69bdb wedding_ring.txt 2021-10-28 22:35:49 -04:00
Northmoc
7c3696cc7e millicent_restless_revenant.txt 2021-10-28 22:08:41 -04:00
Northmoc
ac1d3c1afb typo fix 2021-10-28 21:49:08 -04:00
Tim Mocny
6505c8c55c Merge branch 'blood' into 'master'
VOW blood token

See merge request core-developers/forge!5670
2021-10-29 00:25:59 +00:00
Northmoc
e69dd1cebe VOW blood token 2021-10-28 20:25:23 -04:00
Northmoc
9d62cfa710 strefan_maurer_progenitor.txt 2021-10-28 20:24:09 -04:00
Anthony Calosa
1ae7a4513d Merge branch 'fix-smart-card-art-net-decks' into 'master'
QuickFIX deckSection validation in Decks that inhibited the smart card art option to trigger

See merge request core-developers/forge!5667
2021-10-28 20:38:20 +00:00
leriomaggio
c465350517 Merge remote-tracking branch 'upstream/master' into fix-smart-card-art-net-decks 2021-10-28 21:36:08 +01:00
leriomaggio
40dac70ebf QuickFIX deckSection validation in Decks that inhibited the smart card art option to trigger
This MR brings a quick FIX to `validateDeferredSections` method in Deck which erroneously considered entries in filtered Card Pool as for the valid deck entries, instead of the original one.
Incidentally this affected only decks with no specified edition, imposing one given by card Db query using default Card Art Preference.
In other word, no card with NO edition was found and smart card art was never triggered.

This now won't be the case!

Another quick fix in `getAllCardNamesWithNoSpecifiedEdition` to skip all sections that are not MAIN | SIDE | Commander for which card art harmonisation is necessary.
2021-10-28 21:35:32 +01:00
Michael Kamensky
d87d609765 Merge branch 'VOW_edition' into 'master'
VOW and VOC initial edition files

See merge request core-developers/forge!5664
2021-10-28 19:54:26 +00:00
Michael Kamensky
8f8363f12a Merge branch 'foiling' into 'master'
Fix dropping foil from card when copying

See merge request core-developers/forge!5666
2021-10-28 19:54:20 +00:00
tool4EvEr
2de6fc476c Fix dropping foil from card when copying 2021-10-28 21:20:45 +02:00
paul_snoops
d1769c12d4 VOW and VOC initial edition files 2021-10-28 19:19:17 +01:00
Michael Kamensky
45ab214cee Merge branch 'TRT-master-patch-83249' into 'master'
Update forge-gui/res/cardsfolder/l/ludevic_necro_alchemist.txt

See merge request core-developers/forge!5663
2021-10-28 14:06:48 +00:00