Commit graph

20120 commits

Author SHA1 Message Date
Justin Herlehy
4e15194d08 Merge pull request #3784 from Eleros/feature/HASCON2017Promos
Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight
2017-08-11 15:26:23 -07:00
theelk801
ff47290039 Merge pull request #20 from magefree/master
merge
2017-08-11 18:20:53 -04:00
theelk801
cfdf83929e Implemented Chain of Acid, Chain of Silence, Chain of Smog and Chain Stasis (#3796)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain Stasis
2017-08-11 17:01:57 -05:00
spjspj
edef93d860 Merge pull request #3800 from spjspj/master
Implement Scalelord Reckoner (C17)
2017-08-12 01:13:19 +10:00
spjspj
04037a6d70 Implement Scalelord Reckoner (C17) 2017-08-12 01:12:30 +10:00
spjspj
ee73b72f19 Merge pull request #3799 from spjspj/master
C17 - Implement 3 cards
2017-08-11 19:58:51 +10:00
spjspj
10159cd157 Implement Taigam, Sidisi's Hand (C17) 2017-08-11 19:56:25 +10:00
spjspj
7d2c4b9ab3 Implement Teferi's Protection (C17) 2017-08-11 17:28:03 +10:00
spjspj
625620efcc Implement Traverse the Outlands (C17) 2017-08-11 16:50:57 +10:00
spjspj
1b00198b5a Merge pull request #3798 from spjspj/master
C17 spoilers (201708)
2017-08-11 14:19:41 +10:00
spjspj
8b88e9eed4 C17 spoilers (201708) 2017-08-11 14:18:44 +10:00
Evan Kranzler
82fbb18c0d Implemented Dark Triumph 2017-08-10 13:55:30 -04:00
Evan Kranzler
fbc5d9a0ff Implemented Crookclaw Elder 2017-08-10 10:04:23 -04:00
Evan Kranzler
91a52a8b8f Implemented Complex Automaton 2017-08-10 09:50:22 -04:00
theelk801
b116e446f1 Merge pull request #19 from theelk801/morecrads2
merge
2017-08-10 09:36:49 -04:00
Evan Kranzler
1e1bb6c3ba Implemented Chime of Night 2017-08-10 09:34:03 -04:00
Evan Kranzler
da77fbf90b Implemented Cleansing 2017-08-10 09:28:20 -04:00
Evan Kranzler
4038aa3408 Implemented Chill Haunting 2017-08-10 09:03:19 -04:00
Evan Kranzler
976f2ff1ac Implemented Coiling Woodworm 2017-08-10 08:52:16 -04:00
Evan Kranzler
946cab1355 Implemented Chieftain en-Dal 2017-08-10 08:37:16 -04:00
Evan Kranzler
fcd6edfe6f Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording 2017-08-10 08:18:27 -04:00
Evan Kranzler
abb3a680fc Implemented Chain Stasis 2017-08-10 08:01:32 -04:00
spjspj
c22a8d4ec6 Merge pull request #3795 from spjspj/master
C17 spoilers (201708)
2017-08-10 20:54:14 +10:00
spjspj
127f8d2b96 C17 spoilers (201708) 2017-08-10 20:52:49 +10:00
LevelX2
a3e7aa6230 * Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786). 2017-08-10 07:04:32 +02:00
theelk801
3a52ce609d Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard
2017-08-09 23:13:36 -05:00
Evan Kranzler
fd15838257 Merge origin/morecrads into morecrads
Conflicts:
	Mage.Sets/src/mage/cards/c/ChainOfAcid.java
	Mage.Sets/src/mage/cards/c/ChainOfSmog.java
2017-08-09 21:17:47 -04:00
Evan Kranzler
f7ba430299 Merge commit '6af09943682f52de7b3dca92ecd6f096b5ceb3c0' into HEAD
Conflicts:
	Mage.Sets/src/mage/cards/c/ChainOfAcid.java
	Mage.Sets/src/mage/cards/c/ChainOfSmog.java
2017-08-09 20:51:39 -04:00
Evan Kranzler
6af0994368 Implemented Chain of Acid, Chain of Silence, and Chain of Smog 2017-08-09 20:27:38 -04:00
Evan Kranzler
91ca015cac Implemented Chain of Acid, Chain of Silence, and Chain of Smog 2017-08-09 19:09:43 -04:00
Eleros
b770e8ba51 Merge branch 'master' into feature/HASCON2017Promos 2017-08-09 22:11:19 +02:00
Evan Kranzler
050b2d0c1c Implemented Ceremonial Guard 2017-08-09 12:41:37 -04:00
Evan Kranzler
75853463e9 Implemented Cephalid Inkshrouder 2017-08-09 12:41:35 -04:00
Evan Kranzler
c77971e588 Implemented Cephalid Pathmage 2017-08-09 12:41:34 -04:00
Evan Kranzler
7838049c14 Implemented Carrion 2017-08-09 12:41:32 -04:00
Evan Kranzler
10e1e9d3ab Implemented Break Open 2017-08-09 12:41:31 -04:00
Evan Kranzler
8c664e942d Implement Brown Ouphe 2017-08-09 12:41:29 -04:00
theelk801
e7b5f6e133 Merge pull request #18 from magefree/master
merge
2017-08-09 12:26:49 -04:00
spjspj
5717dc5e69 Merge pull request #3791 from spjspj/master
Update card numbers
2017-08-09 23:57:04 +10:00
spjspj
7efb8bdee4 Update card numbers 2017-08-09 23:56:02 +10:00
spjspj
1f40a486df Merge pull request #3790 from spjspj/master
C17 spoilers (20170809)
2017-08-09 23:51:57 +10:00
spjspj
586da5f594 C17 spoilers (20170809) 2017-08-09 23:50:56 +10:00
theelk801
385e462f15 Implemented Epicenter, Infested Roothold, Brown Ouphe, Rust, Ouphe Vandals, Fatal Attraction, Fighting Chance, Arcbound Fiend, Carry Away, Caverns of Despair, Amulet of Unmaking, Aphetto Exterminator, Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound, Boa Constrictor, Bola Warrior, Brass Talon Chimera, Briar Patch, Brine Shaman, Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin (#3779)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter
2017-08-08 21:49:14 -05:00
theelk801
8b36b16b09 Merge pull request #17 from magefree/master
merge
2017-08-08 17:44:15 -04:00
Evan Kranzler
e47798d6c9 Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter 2017-08-08 14:28:32 -04:00
ingmargoudt
d7e15cf129 Merge pull request #3789 from ingmargoudt/master
fixes
2017-08-08 17:40:52 +02:00
igoudt
63c3689d47 update cabal therapy complying CR 708.4a 2017-08-08 17:37:12 +02:00
igoudt
38a80207cc add unit tests for Spreading Seas bug 2017-08-08 17:20:20 +02:00
igoudt
2ca7927580 AddCardSubtypeAllEffect uses SubType enum 2017-08-08 17:11:21 +02:00
Evan Kranzler
3abe707784 Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman 2017-08-07 20:54:18 -04:00