Sol
|
0f38e714ec
|
Merge branch 'migrate-kaldheim' into 'master'
Migrate Kaldheim from Upcoming
See merge request core-developers/forge!3788
|
2021-02-09 02:12:14 +00:00 |
|
friarsol
|
c88fd07acd
|
Migrate Kaldheim
|
2021-02-08 21:09:44 -05:00 |
|
Sol
|
78a76d0f86
|
Merge branch 'token_fix' into 'master'
Firja's Retribution token fix
See merge request core-developers/forge!3787
|
2021-02-09 02:07:05 +00:00 |
|
Sol
|
93d76b4666
|
Merge branch 'fixNiko' into 'master'
Fix Niko Aris +1
See merge request core-developers/forge!3786
|
2021-02-09 02:06:39 +00:00 |
|
Sol
|
d3232e84af
|
Update ANNOUNCEMENTS.txt
|
2021-02-09 02:02:02 +00:00 |
|
paul_snoops
|
be6d28a18d
|
Firja's Retribution token fix
Angel renamed to Angel Warrior in script
|
2021-02-08 22:02:54 +00:00 |
|
tool4EvEr
|
04d2f7ca63
|
Update Niko Aris +1
|
2021-02-08 20:47:13 +01:00 |
|
Michael Kamensky
|
7f691ddabc
|
Merge branch 'cascadeMDFC' into 'master'
PlayEffect: support restrictions for both MDFC sides & split halves
See merge request core-developers/forge!3773
|
2021-02-08 19:09:38 +00:00 |
|
Bug Hunter
|
01c7aa5889
|
PlayEffect: support restrictions for both MDFC sides & split halves
|
2021-02-08 19:09:38 +00:00 |
|
Lyu Zong-Hong
|
2208dc4199
|
Handle change zone of merged permanent
|
2021-02-09 03:46:51 +09:00 |
|
Lyu Zong-Hong
|
94de589620
|
Small fix on mutate keyword
|
2021-02-09 01:47:03 +09:00 |
|
CCTV-1
|
f67a2eb456
|
Merge remote-tracking branch 'upstream/master' into display_localization_cardname
|
2021-02-08 22:20:58 +08:00 |
|
Lyu Zong-Hong
|
0eef317c42
|
Try to keep original card and not migrate to new card
|
2021-02-08 22:36:20 +09:00 |
|
Lyu Zong-Hong
|
610d712b11
|
Add TimesMutated counter. Refactor how mutate get abilities
|
2021-02-08 20:56:15 +09:00 |
|
Anthony Calosa
|
74935cf4aa
|
Merge branch 'kevlahnota-master-patch-47173' into 'master'
revert parallax_wave.txt (seems it works correctly now with the latest changes)
Closes #1713
See merge request core-developers/forge!3783
|
2021-02-08 04:23:41 +00:00 |
|
Anthony Calosa
|
113fc4ee36
|
revert parallax_wave.txt (seems it works correctly now with the latest changes)
closes #1713
|
2021-02-08 04:23:21 +00:00 |
|
Michael Kamensky
|
ae7373bdd0
|
Merge branch 'card-fixes' into 'master'
Bag of Holding fix
See merge request core-developers/forge!3779
|
2021-02-08 03:53:21 +00:00 |
|
Michael Kamensky
|
5fb30770dc
|
Merge branch 'fixMagus' into 'master'
Magus of the Mind: Fix exiled cards staying playable after turn ends
See merge request core-developers/forge!3780
|
2021-02-08 03:53:18 +00:00 |
|
Hans Mackowiak
|
31990aec2a
|
Merge branch '1712-second-sunrise-now-only-returns-artifacts' into 'master'
Resolve "Second Sunrise now only returns artifacts"
Closes #1712
See merge request core-developers/forge!3782
|
2021-02-08 01:16:52 +00:00 |
|
Hans Mackowiak
|
66b199fcb3
|
fix ThisTurnEntered usage
|
2021-02-08 02:16:29 +01:00 |
|
Hans Mackowiak
|
d8b08e3469
|
Merge branch 'shard' into 'master'
Fix shard cost
See merge request core-developers/forge!3781
|
2021-02-08 01:07:53 +00:00 |
|
tool4EvEr
|
39442b0f01
|
Fix shard cost
|
2021-02-07 22:27:41 +01:00 |
|
tool4EvEr
|
ec0fc55bbe
|
Fix exiled cards staying playable after turn ends
|
2021-02-07 22:12:26 +01:00 |
|
Adam Pantel
|
9e704b5860
|
Bag of Holding fix
|
2021-02-07 15:04:40 -05:00 |
|
Hans Mackowiak
|
a267b800b6
|
GameAction: when movedToStack, setSplitStateToPlayAbility
|
2021-02-07 17:26:09 +01:00 |
|
Hans Mackowiak
|
02426617eb
|
hotfix isCardAddedThisTurn
|
2021-02-07 16:54:12 +01:00 |
|
Hans Mackowiak
|
38fc33342e
|
Merge branch 'thisTurnEnteredProperty' into 'master'
CardProperty: ThisTurnEntered and ThisTurnEnteredFrom for better check
Closes #1711 and #1710
See merge request core-developers/forge!3777
|
2021-02-07 14:40:06 +00:00 |
|
Hans Mackowiak
|
b03a641d34
|
Merge branch 'freezingFlame' into 'master'
Extend DamagedBy and add Aegar the freezing Flame
See merge request core-developers/forge!3778
|
2021-02-07 14:39:35 +00:00 |
|
Hans Mackowiak
|
09dc93f6c3
|
CardProperty: ThisTurnEntered and ThisTurnEnteredFrom for better check
|
2021-02-07 12:10:46 +01:00 |
|
Hans Mackowiak
|
5cb2a0a8ee
|
Merge branch 'fixTree' into 'master'
Fix World Tree missing Tap Cost
See merge request core-developers/forge!3776
|
2021-02-07 10:06:55 +00:00 |
|
Bug Hunter
|
cc8e286933
|
Fix World Tree missing Tap Cost
|
2021-02-07 10:06:55 +00:00 |
|
Sol
|
69f8980c13
|
Merge branch 'Williams-master-patch-12266' into 'master'
Spectral Deluge CMC fix
See merge request core-developers/forge!3775
|
2021-02-06 21:35:02 +00:00 |
|
John
|
81d9706620
|
Spectral Deluge CMC fix
|
2021-02-06 21:35:02 +00:00 |
|
Michael Kamensky
|
be9675d68a
|
Merge branch 'Williams-master-patch-08403' into 'master'
Spirit of Aldergard fix
See merge request core-developers/forge!3774
|
2021-02-06 18:15:43 +00:00 |
|
John
|
19be5a456b
|
Update spirit_of_the_aldergard.txt
|
2021-02-06 17:43:55 +00:00 |
|
Michael Kamensky
|
412e574003
|
Merge branch 'triggerChangesZoneAllPermanent' into 'master'
PermanentEffect: playing cards causes ChangesZoneAll to trigger
See merge request core-developers/forge!3771
|
2021-02-06 14:27:06 +00:00 |
|
Lyu Zong-Hong
|
87330ac828
|
Remove trailing spaces
|
2021-02-06 22:43:05 +09:00 |
|
Lyu Zong-Hong
|
66a7d6a83b
|
Mutate second step
|
2021-02-06 22:40:40 +09:00 |
|
Lyu Zong-Hong
|
c845d0566f
|
Mutate first step
|
2021-02-06 22:40:39 +09:00 |
|
Michael Kamensky
|
7d3703bc1e
|
Merge branch 'random_fixes' into 'master'
Various fixes
See merge request core-developers/forge!3765
|
2021-02-06 13:12:59 +00:00 |
|
Hans Mackowiak
|
7355b56246
|
PermanentEffect: playing cards causes ChangesZoneAll to trigger
|
2021-02-06 14:10:07 +01:00 |
|
Michael Kamensky
|
6aa89f900f
|
Merge branch 'abandoned_sarcophagus' into 'master'
Cycling: add Flag if card is discarded for cost with cycling
See merge request core-developers/forge!3770
|
2021-02-06 11:03:29 +00:00 |
|
Hans Mackowiak
|
ab3cd5f80f
|
Cycling: add Flag if card is discarded for cost with cycling
|
2021-02-06 08:48:50 +01:00 |
|
Anthony Calosa
|
d163d75ebd
|
Merge branch 'master' into 'master'
[Android] fix init for displaying error message
See merge request core-developers/forge!3769
|
2021-02-06 07:38:06 +00:00 |
|
Anthony Calosa
|
4d394778a0
|
[Android] fix init for displaying error message
|
2021-02-06 15:34:24 +08:00 |
|
Hans Mackowiak
|
fa2f7c43ae
|
MagicStack: fix Bestow resolve on fizzle
|
2021-02-06 07:45:50 +01:00 |
|
Michael Kamensky
|
0697b4df33
|
Merge branch 'khc5' into 'master'
KHC - 5 Feb
See merge request core-developers/forge!3763
|
2021-02-06 04:18:35 +00:00 |
|
Michael Kamensky
|
80d855d996
|
Merge branch 'klaxnek-master-patch-72751' into 'master'
Update es-ES.properties
See merge request core-developers/forge!3766
|
2021-02-06 04:17:30 +00:00 |
|
Michael Kamensky
|
4ef3a1a3e9
|
Merge branch 'fixOathbreaker' into 'master'
Fix Oathbreaker commander replacement
See merge request core-developers/forge!3767
|
2021-02-06 04:17:22 +00:00 |
|
Michael Kamensky
|
82ae14722b
|
Merge branch 'tales' into 'master'
KHC: Tales of the Ancestors and support
See merge request core-developers/forge!3768
|
2021-02-06 04:17:02 +00:00 |
|