Michael Kamensky
32df7f3eae
Merge branch 'fixsuspend' into 'master'
...
Suspend Fixes
See merge request core-developers/forge!4828
2021-06-06 03:29:09 +00:00
Bug Hunter
4b3839b143
Suspend Fixes
2021-06-06 03:29:08 +00:00
Michael Kamensky
d5aaa4dc45
Merge branch 'repeateach' into 'master'
...
RepeatPlayers - Swap out other remembered while resolving
See merge request core-developers/forge!4834
2021-06-06 03:27:03 +00:00
Bug Hunter
999e4f81ee
RepeatPlayers - Swap out other remembered while resolving
2021-06-06 03:27:02 +00:00
Michael Kamensky
c38d2f531c
Merge branch 'carth' into 'master'
...
MH2: Carth the Lion
See merge request core-developers/forge!4760
2021-06-06 03:26:09 +00:00
Bug Hunter
b10ce1b884
Carth support
2021-06-06 03:26:07 +00:00
tool4EvEr
e6280377ce
Fix crash with City in a Bottle & Facedown
2021-06-05 20:22:30 +02:00
Michael Kamensky
1633dedee3
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-06-05 17:34:06 +03:00
Michael Kamensky
9ae41c67a2
Merge branch 'replace_damage_missing_cards' into 'master'
...
Implement remaining damage prevention/redirection cards
See merge request core-developers/forge!4832
2021-06-05 14:28:35 +00:00
Michael Kamensky
1f2cc92533
Merge branch 'phasing' into 'master'
...
Phasing Fixes
Closes #531
See merge request core-developers/forge!4808
2021-06-05 14:27:11 +00:00
Northmoc
889173a682
move PutCounter cost earlier
2021-06-05 08:02:27 -04:00
Lyu Zong-Hong
ab31c8fa9d
Implement missing cards with dividable shields for damage replacement effects
2021-06-05 18:20:02 +09:00
Lyu Zong-Hong
f95fb7d08b
Choose source for prevent/redirect next N damage effect
2021-06-05 18:20:01 +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
dccf161d54
Fix Untap of card that should't after phasing in
2021-06-04 20:27:44 +02:00
tool4EvEr
c648a8ccbc
Stop counting phased out cards
2021-06-04 20:27:43 +02:00
tool4EvEr
83dc9b688b
Fix for phasing
2021-06-04 20:27:42 +02:00
tool4EvEr
2d53623ab2
Fix echo cost not skipable with phasing
2021-06-04 20:27:41 +02:00
tool4EvEr
d0d14b9006
Fix missing trigger when phased out
2021-06-04 20:27:41 +02:00
tool4EvEr
db85958008
Fix effects on phased out cards
2021-06-04 20:27:40 +02:00
tool4EvEr
58866b0595
when phasing out end Until
2021-06-04 20:27:39 +02:00
tool4EvEr
f6f2d5e4de
Fix Attachments not phasing back in when the card attached to does
2021-06-04 20:27:39 +02:00
Northmoc
647a0d8a2f
brown acorns
2021-06-04 13:02:58 -04:00
Northmoc
2364e8dd26
Combat.java set up defending planeswalker and controller to receive damage with trample over planeswalkers
2021-06-04 13:00:22 -04:00
Northmoc
3010657620
handle Trample over planeswalkers keyword
2021-06-04 13:00:20 -04:00
Northmoc
35477a5edb
Trample over planeswalkers reminder text
2021-06-04 13:00:20 -04:00
Michael Kamensky
a23a1fa928
Merge branch 'handcount' into 'master'
...
Fix full fizzling for targeted players & SA
See merge request core-developers/forge!4817
2021-06-04 15:39:04 +00:00
tool4EvEr
a2cd1fa8ef
Reset extras after restart
2021-06-04 12:46:40 +02:00
Michael Kamensky
1d749eba48
Merge branch 'entwine' into 'master'
...
Entwine reminder text
See merge request core-developers/forge!4818
2021-06-04 03:55:02 +00:00
Northmoc
a909fc1fa8
CardFactoryUtil expand Devour keyword possibilities
2021-06-03 16:18:15 -04:00
Northmoc
919a49b22e
Card.java override reminder text for Devouring non-creature stuff
2021-06-03 16:18:15 -04:00
Northmoc
5aad37c613
Entwine reminder text
2021-06-03 16:07:29 -04:00
tool4EvEr
69e580e37d
Fix full fizzling
2021-06-03 21:09:16 +02:00
Michael Kamensky
f08cb0f0b5
Merge branch 'activation' into 'master'
...
ActivationTable: Fix NPE for triggers without OverridingAbility
Closes #1859
See merge request core-developers/forge!4799
2021-06-03 14:07:15 +00:00
Michael Kamensky
bbf1e373ad
Merge branch 'fixstuff' into 'master'
...
Some smaller fixes
Closes #1868
See merge request core-developers/forge!4806
2021-06-03 14:02:50 +00:00
tool4EvEr
196b48cbd3
Reduce FailedToTarget scenario
2021-06-03 10:14:16 +02:00
Michael Kamensky
2144de87d4
Merge branch 'velus' into 'master'
...
MH2: Mount Velus Manticore and support
See merge request core-developers/forge!4809
2021-06-03 05:15:59 +00:00
Northmoc
5ac9d3fdff
AbilityUtils support for Count$CardNumTypes / Count$RememberedCardNumTypes
2021-06-02 15:52:41 -04:00
Northmoc
da2a92b74a
CardFactoryUtil prep TypeCycling for Artifact landcycling
2021-06-02 15:06:29 -04:00
Northmoc
9aba2db8ce
KeywordWithCostAndType.java set artifact landcycling for reminder text
2021-06-02 15:05:30 -04:00
tool4EvEr
29a4fdb47a
prevent StackDescription from revealing face
2021-06-01 21:47:58 +02:00
tool4EvEr
931411b6e4
Fix Wandering Archaic
2021-06-01 18:38:26 +02:00
tool4EvEr
8157172a9f
Fix City in a Bottle
2021-06-01 17:53:53 +02:00
Michael Kamensky
5ac73d9f90
Merge branch 'fix-deck-editor-custom-editions-image-view' into 'master'
...
Improvements to Deck Editor for Custom Editions
See merge request core-developers/forge!4796
2021-06-01 04:26:05 +00:00
Michael Kamensky
16b2fd93d8
Merge branch 'spellcast' into 'master'
...
Fix missing intrinsic Cast trigger from copied host
See merge request core-developers/forge!4754
2021-06-01 04:25:28 +00:00
Bug Hunter
edce6ed9e8
Fix missing intrinsic Cast trigger from copied host
2021-06-01 04:25:27 +00: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
43a62813e6
Custom Editions are now included in GameFormat when checking for sets
2021-05-31 10:44:48 +01:00
