github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-18 19:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
12451 commits 2 branches 0 tags 782 MiB
Commit graph

12451 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
cb3b5f895b Merge pull request #1060 from ilcartographer/ME3 
Me3
 2015-06-28 00:07:21 +02:00
Marshall
ee1902a2cc Fixed Exorcist; Patching out Forked Lightning due to bug with assigning damage 2015-06-27 16:02:19 -04:00
LoneFox
98e4266cf5 Implement cards: Disorder, Impatience, and Thoughtleech 2015-06-27 22:18:39 +03:00
LoneFox
cbe6dfb60e Implement cards: Bellowing Fiend, Caltrops, Reprocess, and Yawgmoth's Edict 2015-06-27 15:13:41 +03:00
LevelX2
25f09e1891 Added Test. 2015-06-27 11:58:53 +02:00
LevelX2
a8742b934a Some minor code reworks. 2015-06-27 10:24:00 +02:00
LevelX2
c764da43f3 Fixed Scaleguard Sentinels and Thunderbreak Regent swapped card numbers of Magic Game Day Cards set. 2015-06-27 10:23:20 +02:00
LevelX2
2046511cdd Merge origin/master 2015-06-27 09:40:01 +02:00
LevelX2
42d71b15c4 * Aquitect's Will - Fixed that the conditional effect did not take tribal enchantments into account. 2015-06-27 09:33:41 +02:00
LevelX2
c774e95335 * Fixed some possible java exception causes. 2015-06-27 09:32:50 +02:00
LoneFox
98782dbacb Implement cards: Feroz's Ban, Nocturnal Raid, Shield Wall, and Tainted AEther 2015-06-27 10:28:06 +03:00
Cameron Miller
9a8864aea5 Merge pull request #7 from magefree/master 
Pull request
 2015-06-26 23:31:40 +01:00
fireshoes
7963e62e81 Merge origin/master 2015-06-26 13:20:45 -05:00
fireshoes
01d8c8bab3 [ORI] Updated 6/26 spoilers. Added Goblin Piledriver reprint. [5ED] Added Feldon's Cane 2015-06-26 13:19:30 -05:00
LevelX2
b668209f7d Fixed for Flameshadow Conjuring and Felhide Spiritbinder that the created tokens did not get haste or the added card type enchantment. 2015-06-26 19:20:27 +02:00
LevelX2
d30709e1b0 * Obzedat, Ghost Council - Fixed possible null pointer exception. 2015-06-26 18:33:16 +02:00
LevelX2
f37761fbc1 Some minor changes/renames. 2015-06-26 18:28:50 +02:00
LevelX2
fffbc526b1 Merge pull request #1057 from EvilGeek/master 
Pull request
 2015-06-26 18:16:31 +02:00
Mark
74a399343a Merge origin/master 2015-06-26 11:04:16 -04:00
Mark
e35a7b2f36 new cards Barbed Shocker ,Cabal Slaver, Shoker 
added new DiscardHandAndDrawEffect
 2015-06-26 10:37:37 -04:00
Mark
9294bac4c2 Harvest Wurm implementation 2015-06-26 10:37:35 -04:00
mkalender
271957a1a1 new card Mwonvulia Acid Moss 2015-06-26 10:37:33 -04:00
mkalender
9bb10eb8c9 Revert "set filter on restriction effect" 
This reverts commit cb99dbd330.
 2015-06-26 10:37:31 -04:00
mkalender
d231ace130 set filter on restriction effect 2015-06-26 10:37:28 -04:00
LevelX2
d65581809f * Notion Thief - Fixed that the replacment effect was not always applied as intended. 2015-06-26 15:16:33 +02:00
LoneFox
2a477a2683 Implement cards: Grafted Skullcap, Nature's Revolt, Sqouthern Paladin, and Squall 2015-06-26 14:15:24 +03:00
LoneFox
33690f902f Implement cards: Baleful Stare, Telepathic Spies, Wall of Wonder, and Withering Gaze 2015-06-26 13:16:03 +03:00
LevelX2
5b7d57aec9 Added some tests. 2015-06-26 12:10:17 +02:00
LevelX2
7a8e1f11c7 * Fixed a bug that destroying a commander not counted as successful destroy when the commander went to command zone (e.g. important for Phyrexian Rebirth like effects). 2015-06-26 12:10:03 +02:00
LoneFox
87a5ce620d Simplify Gerrard's Wisdom 2015-06-26 10:36:16 +03:00
fireshoes
833fd76323 Added several cards 2015-06-26 02:12:55 -05:00
Cameron Miller
74f6999bb9 Merge pull request #6 from magefree/master 
Pull request
 2015-06-25 22:37:37 +01:00
fireshoes
5b09f32409 Merge origin/master 2015-06-25 16:36:42 -05:00
fireshoes
a9099376cd [ORI] Added Flameshadow Conjuring, Alhammarret's Archive, Jace's Sanctum, Helm of the Gods, Woodland Bellower, Unholy Hunger, Exquisite Firecraft, Undead Servant. Minor changes to mtg-cards-data.txt. [TOR]Added Insist. 2015-06-25 16:36:05 -05:00
Cameron Miller
cd04358bd2 Fixed imports on unnatural selection 2015-06-25 22:34:28 +01:00
Cameron Miller
4d98cc970d Merge branch 'master' of https://github.com/EvilGeek/mage 2015-06-25 22:29:11 +01:00
LevelX2
f6178a887b Merge pull request #1056 from LoneFox78/master 
New stuff
 2015-06-25 23:28:04 +02:00
Cameron Miller
f0a43bad82 Implemented Unnatural Selection (needs to be tested). 2015-06-25 22:20:22 +01:00
Cameron Miller
17fc9b7fc4 Merge pull request #5 from magefree/master 
Pull request
 2015-06-25 22:17:52 +01:00
LevelX2
12cba2d0ab Minor changes. 2015-06-25 23:13:45 +02:00
LevelX2
77c9d6e989 Added BecomesSubtypeTargetEffect for Unnatural Selection. 2015-06-25 22:30:58 +02:00
LoneFox
9ca40cf38d Implement card: Story Circle 2015-06-25 20:42:02 +03:00
fireshoes
9741d34e1e Merge origin/master 2015-06-25 12:16:46 -05:00
fireshoes
1463da4bc7 [ORI] Updated mtg-cards-data.txt for 6/25 spoilers. Added Citadel Castellan, Topan Freeblade, painland reprints. [VMA] Added 8 cards 2015-06-25 12:15:20 -05:00
LevelX2
67aec0be0b * Plea for Power - Fixed the order the players are asked to vote. 2015-06-25 17:16:39 +02:00
LevelX2
ee304e773e * Daxos of Meletis - Fixed that the mana as thought ability did not work. Fixed that a instant could also be cast from other players. 2015-06-25 16:57:44 +02:00
Cameron Miller
53c048870c Merge pull request #4 from magefree/master 
Pull request
 2015-06-25 15:31:11 +01:00
LevelX2
7bc8649585 * Animate Dead - Fixed that the target card in graveyard was not handled correct, if the Animate Dead reentered the Battlefield(e.g. with Worldgorger Dragon combo). 2015-06-25 14:31:23 +02:00
LoneFox
2ccf80942e Implement cards: Death Match, Gerrard's Wisdom, Ghitu Fire-Eater, Pyromancy, and Scavenger Folk 2015-06-25 11:59:37 +03:00
LoneFox
01d724ff3b Fix yet another copy-paste error 2015-06-25 10:45:49 +03:00