github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-28 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
17873 commits 2 branches 0 tags 782 MiB
Commit graph

17873 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingmargoudt
e0173a791c Merge https://github.com/magefree/mage 2017-03-11 13:43:41 +01:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
LevelX2
d89dfd4ac3 Added some missing MM3 cards and fixed wrong collector numbers. Allow image download for MM3. 2017-03-11 12:33:59 +01:00
LevelX2
c042d50ec7 Fixed a bug that fizzling spell copies let also wrongly fizzle the original spell on the stack the copy was made from. 2017-03-11 12:00:05 +01:00
LevelX2
2d20045b61 Bloodbond March - minor change. 2017-03-11 09:49:51 +01:00
LevelX2
7843187bc7 Merge pull request #2958 from JRHerlehy/master 
Implement Bloodbond March
 2017-03-11 09:41:41 +01:00
Justin Herlehy
3e60eb7780 Implement Bloodbond March 2017-03-11 00:01:51 -08:00
Jeff
80f524d94d - Fixed type on Solemn Recruit 2017-03-10 16:18:39 -06:00
Jeff
8c62038d7e - Fixed Nacatl War-Pride 2017-03-10 15:59:06 -06:00
Jeff
609fbc7f7b - Fixed Uba Mask. 2017-03-10 15:20:25 -06:00
Nathaniel Brandes
74b9f0eb24 Remove some unnecessary checks. 2017-03-09 23:39:50 -08:00
Nathaniel Brandes
900d68f77d Fix CMC for flashbacked cards. 
This should fix Conflagate/Chalice of the Void interaction.
 2017-03-09 23:32:42 -08:00
ingmargoudt
d0a9006f37 Merge branch 'master' of https://github.com/magefree/mage 2017-03-09 21:05:37 +01:00
Jeff
368dd9a5be - Fixed Possibility Storm. 
Issue: https://github.com/magefree/mage/issues/2685
 2017-03-09 12:26:50 -06:00
Jeff
cb5fc3037e - Changed the SimpleActivatedAbility to a SimpleManaAbility on Selvala, Heart of the Wilds. 2017-03-09 10:41:01 -06:00
Jeff
691c590e68 - Fixed Selvala, Heart of the Wilds. 2017-03-09 10:15:57 -06:00
spjspj
17aa9e3f6c Merge pull request #2954 from spjspj/master 
Slight fix for modern cube
 2017-03-09 23:14:51 +11:00
spjspj
1646fb491f Slight fix for modern cube 2017-03-09 23:13:56 +11:00
Nathaniel Brandes
d7d700f66a Some clarification around loyalty. Added unit test. 2017-03-09 02:30:52 -08:00
Nathaniel Brandes
dd0c89db1d Fix Dack Fayden Emblem. 
The emblem's effect was referencing the permanent directly.
This meant that if the permanent left and came back, the control effect
would start working again.
 2017-03-09 02:24:34 -08:00
Justin Herlehy
964f2fb9d0 Corrected card listing in Scourge set file. 2017-03-09 01:57:21 -08:00
Justin Herlehy
9dd1e60f2d Implement Clutch of Undeath 
Implement Clutch of Undeath and add test to ensure functionality.
 2017-03-09 01:48:34 -08:00
Justin Herlehy
1a2724c9b2 Revert: Fix planeswalker loyalty counters. 
This change was incorrect.

Gatherer Ruling:
10/1/2005: Planeswalkers will enter the battlefield with double the normal amount of loyalty counters. However, if you activate an ability whose cost has you put loyalty counters on a planeswalker, the number you put on isn’t doubled. This is because those counters are put on as a cost, not as an effect.
 2017-03-09 01:14:10 -08:00
Nathaniel Brandes
52fa369024 Fix planeswalker loyalty counters. 
They should be added like normal counters, firing events that can be
intercepted by cards like doubling season.
 2017-03-08 23:57:11 -08:00
Nathaniel Brandes
2ecb415b4d Removed potential integer overflow. 
If the number passed into max is Integer.MAX_VALUE, like it is with
ChoiceOfDamnation, the random number will overflow. So let's not do
that.
 2017-03-08 21:43:37 -08:00
Nathaniel Brandes
4a9eddb724 Properly fix targeting. 
The notTarget should only invalidate the canBeTargetedBy return.
The Filter should still be relevant.
 2017-03-08 20:59:01 -08:00
Nathaniel Brandes
495e20ae1a Fix target defender cases that don't target. 2017-03-08 20:44:02 -08:00
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