Nathaniel Brandes
ef29fab8ea
Merge pull request #2948 from ImperatorPrime/phyrexian-mana-fix
...
Phyrexian mana now correctly a payment choice.
2017-03-08 20:03:01 -08:00
Nathaniel Brandes
ce1f4a3bf8
Phyrexian mana now correctly a payment choice.
...
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.
This fixes trinisphere interactions and should be consistent with the
rules.
2017-03-08 20:03:28 -08:00
Jeff
209e2d13c1
- Fix for Spellskite in situations where it was also a target. Fixed the test for Spellskite.
2017-03-08 12:05:36 -06:00
ingmargoudt
0b93ac9fdf
Merge branch 'master' of https://github.com/magefree/mage
2017-03-08 11:24:12 +01:00
Nathaniel Brandes
3bebdd65bc
Fixed crewing staying if the object changed zones.
2017-03-08 01:01:10 -08:00
Nathaniel Brandes
34ea9e53d0
Rev .pom Java version to fix compilation.
2017-03-07 22:31:30 -08:00
Achilles
31ba751c66
- Fix for Spellskite dealing with a targeted source spell/ability that has multiple targets.
2017-03-07 22:14:18 -06:00
Achilles
f5d13944a6
- Test for Auratouched Mage. The tests worked fine in the game, but the test suite can't handle it yet.
2017-03-07 20:52:13 -06:00
ingmargoudt
cac6f1b344
Merge pull request #2947 from ingmargoudt/master
...
commandzone is public
2017-03-07 23:20:19 +01:00
ingmargoudt
eb1e285a25
Merge branch 'master' of https://github.com/magefree/mage
2017-03-07 23:19:45 +01:00
ingmargoudt
7e26a7a141
commandzone is public
2017-03-07 23:19:05 +01:00
ingmargoudt
603984c8b0
Merge pull request #2946 from ingmargoudt/master
...
various rewrites
2017-03-07 22:29:13 +01:00
ingmargoudt
4aaf73e0d2
changed the type used in ImagePanel from an int to an enum
2017-03-07 22:28:10 +01:00
ingmargoudt
0a77c186be
moved sessionstate enum to sessionImpl
2017-03-07 22:15:58 +01:00
Derek M
2ff68c2fb3
Merge pull request #2944 from Alexsandr0x/sakashima-bug
...
SpellStutter Sprite - Sakashima Impostor Bug
2017-03-07 16:10:06 -05:00
ingmargoudt
daed944eb6
refactored the SortBy.getByString
2017-03-07 22:06:44 +01:00
ingmargoudt
c5002983e3
changed static zone function to enum method
2017-03-07 22:02:15 +01:00
ingmargoudt
1bc8e2248b
changed enum equals to ==, removed contains check for set
2017-03-07 21:47:11 +01:00
emerald000
46ab7daf55
Merge pull request #2945 from ZeldaZach/fix_parallelevolution
...
fix flashback cost
2017-03-07 15:33:36 -05:00
Zach H
ca73258654
fix flashback cost
2017-03-07 15:29:06 -05:00
ingmargoudt
142efb3e6d
Merge pull request #2942 from drmDev/feature/email-empty
...
#2705 if an empty email address is used, display a more specific message
2017-03-07 17:31:20 +01:00
ingmargoudt
42cffbc114
Merge pull request #2943 from ingmargoudt/master
...
change getLibrary().size() > 0 to hasCards()
2017-03-07 17:29:58 +01:00
ingmargoudt
1caf3a6be4
change getLibrary().size() > 0 to hasCards()
2017-03-07 17:28:26 +01:00
Derek Monturo
0ecf679c7f
if an empty email address is used, display a more specific message
2017-03-07 10:23:51 -05:00
Nathaniel Brandes
d6e4ef793e
Fix delve.
...
Delve should not target the cards it exiles.
2017-03-07 00:03:37 -08:00
Alexsandro
b83bc9d68a
Assert if Sakashima copied SpellStutter by S/T
2017-03-06 21:11:09 -03:00
Alexsandro
3c5bd9acce
Check if exists a target to counter in Stack before counter
2017-03-06 19:06:37 -03:00
Derek M
0280c6231b
Merge pull request #2939 from drmDev/ut/linvalaSilences
...
#2157 Linvala tests on activated abilities
2017-03-06 17:02:54 -05:00
Derek Monturo
3b6ffe9382
#2157 Linvala tests on activated abilities
2017-03-06 17:02:23 -05:00
Derek M
65740c315f
Merge pull request #2938 from drmDev/ut/impersonator-dawn
...
Ut/impersonator dawn
2017-03-06 16:35:30 -05:00
Derek Monturo
e28dd5aef7
minor added another assert
2017-03-06 16:34:52 -05:00
Derek Monturo
f93524a0f7
#2135 added test for clever impersonator copying an aura
2017-03-06 16:32:40 -05:00
Alexsandro
d98e43ded2
Create test class to validate error
2017-03-06 16:15:17 -03:00
Alexsandro
6fb344a306
Create test class to validate error
2017-03-06 16:15:02 -03:00
Derek M
a02e366c2d
Merge pull request #2936 from drmDev/ut/athreos
...
#2832 test for Athreos not triggering on Cartel sac ability
2017-03-06 14:13:36 -05:00
Derek Monturo
c53c0d2e9e
#2832 test for Athreos not triggering on Cartel sac ability
2017-03-06 14:12:38 -05:00
spjspj
134d1b5872
Merge pull request #2934 from spjspj/master
...
spjspj - Implement Land Equilibrium (LEG, ME3)
2017-03-07 01:21:19 +11:00
spjspj
c34826611b
spjspj - Implement Land Equilibrium (LEG, ME3)
2017-03-07 01:20:35 +11:00
spjspj
d63835359a
Merge pull request #2933 from spjspj/master
...
spjspj - Implement Land Equilibrium (LEG, ME3)
2017-03-07 00:58:02 +11:00
spjspj
2e4d5e2bba
spjspj - Implement Land Equilibrium (LEG, ME3)
2017-03-07 00:57:04 +11:00
spjspj
d822e98005
Merge pull request #2932 from spjspj/master
...
spjspj - Implement Planar Void (USG)
2017-03-06 23:59:30 +11:00
spjspj
fd57cf537c
spjspj - Implement Planar Void (USG)
2017-03-06 23:56:02 +11:00
ingmargoudt
2cc1f2614d
Merge pull request #2931 from ingmargoudt/master
...
fixed a count in Battlefield, changed loops to streams
2017-03-06 12:26:09 +01:00
ingmargoudt
90c6a69335
fixed a count in Battlefield, changed loops to streams
2017-03-06 12:25:14 +01:00
ingmargoudt
26fc9161d4
Merge pull request #2930 from ingmargoudt/master
...
put comparing logic in counttype, remove all switches
2017-03-06 11:48:05 +01:00
ingmargoudt
3d029d6ad5
put comparing logic in counttype, remove all switches
2017-03-06 11:46:22 +01:00
ingmargoudt
0adc715499
Merge pull request #2929 from ingmargoudt/master
...
small change in gender enum
2017-03-06 10:21:29 +01:00
ingmargoudt
6d4c388c5e
small change in gender enum
2017-03-06 10:18:16 +01:00
Eric McVicker
80814b457c
Merge pull request #2928 from JOAC69/master
...
Remove trailing space on CardHelper.getType()
2017-03-05 19:15:24 -06:00
JOAC69
9145f64afe
Merge remote-tracking branch 'upstream'
2017-03-05 19:10:36 -06:00
