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
24855 commits 2 branches 0 tags 782 MiB
Commit graph

24855 commits

This branch
This branch
All branches
Author SHA1 Message Date
L_J
a99f870d34
Implemented Dauntless Bodyguard 2018-04-16 16:45:13 +00:00
spjspj
91cf3556d4
Merge pull request #4772 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-17 02:43:45 +10:00
L_J
4cb278304e
Merge pull request #50 from magefree/master 
Merge https://github.com/magefree/mage
 2018-04-16 18:40:59 +02:00
spjspj
776928c76c Continuing implementation of Planechase. 2018-04-17 02:13:48 +10:00
LevelX2
1ec0e66300 [DOM] Zahid, Djinn of the Lamp 2018-04-16 17:03:42 +02:00
LevelX2
f1cb1ca780 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java
	Mage.Sets/src/mage/cards/w/WildOnslaught.java
	Mage.Sets/src/mage/sets/Dominaria.java
 2018-04-16 16:38:00 +02:00
LevelX2
a8831dd7da [DOM] Added Whisper, Blood Liturgist / Wild Onslaught / Windgrace Acolyte. 2018-04-16 16:30:19 +02:00
Evan Kranzler
a7de841967 Implemented Grow from the Ashes 2018-04-16 09:35:28 -04:00
Evan Kranzler
33e5c73659 Implemented Ghitu Journeymage 2018-04-16 09:28:38 -04:00
Evan Kranzler
7db4b1a2e6 Implemented Final Parting 2018-04-16 09:22:54 -04:00
Evan Kranzler
d802a555bc Implemented Wild Onslaught 2018-04-16 09:04:34 -04:00
Evan Kranzler
1d142ff13a Implemented Whisper, Blood Liturgist 2018-04-16 09:00:07 -04:00
theelk801
d275c81254
Merge pull request #4771 from rscoates/implementRunAmok 
implement Run Amok
 2018-04-16 08:51:56 -04:00
richard.coates
03a59f5867 Added set text. 2018-04-16 14:38:36 +02:00
theelk801
8c4f59a23a
Merge pull request #4769 from rscoates/implementStrongholdConfessor 
Implement Stronghold Confessor
 2018-04-16 08:35:25 -04:00
theelk801
c8ceec058c
Merge pull request #4770 from rscoates/implementShivanFire 
Implement Shivan Fire
 2018-04-16 08:34:53 -04:00
richard.coates
cb06be905f implement Run Amok 2018-04-16 09:14:19 +02:00
richard.coates
9d79156f25 Change {this} 2018-04-16 08:56:40 +02:00
richard.coates
8b8175542f Change comments 2018-04-16 08:55:46 +02:00
Evan Kranzler
eed08a950b fixed card numbers 2018-04-16 01:17:10 -04:00
Oleg Agafonov
a837a4f0f0 Fixed broken tests after mana texts changes 2018-04-16 01:35:37 +04:00
Oleg Agafonov
4c92f41876
Merge pull request #4759 from tcontis/master 
Implemented Word of Undoing (Ice Age)
 2018-04-16 00:09:12 +04:00
LevelX2
5b6e3cd72e Merge origin/master 2018-04-15 21:54:46 +02:00
LevelX2
9d7b2c808e [DOM] Added five cards. 2018-04-15 21:54:03 +02:00
Evan Kranzler
50b5377a8e fixed mana pool errata 2018-04-15 14:30:01 -04:00
Evan Kranzler
41c9b08107 some more fixes 2018-04-15 14:13:44 -04:00
Evan Kranzler
ef33472ee5 fixed some tests and text 2018-04-15 13:50:48 -04:00
Evan Kranzler
bddb958ea3 Implemented Vodalian Arcanist 2018-04-15 13:30:27 -04:00
Evan Kranzler
5f6731b3d2 Implemented Vicious Offering 2018-04-15 13:27:18 -04:00
Evan Kranzler
971da989dc Implemented Merfolk Trickster 2018-04-15 13:20:57 -04:00
theelk801
8e33891383
Merge pull request #4768 from rscoates/implementGiftOfGrowth 
Implement Gift of Growth
 2018-04-15 13:07:43 -04:00
richard.coates
b170fa31af Implement Shivan Fire 2018-04-15 18:41:16 +02:00
richard.coates
0a754207cf Remove PayLifeCost 2018-04-15 18:34:16 +02:00
richard.coates
85f64d5c28 Implement Stronghold Confessor 2018-04-15 18:33:17 +02:00
richard.coates
a8fef9fddc Implement Gift of Growth 2018-04-15 18:24:22 +02:00
theelk801
6d7a3cbf4b
Merge pull request #4767 from rscoates/implementDarkBargain 
Correct Dark Bargain to instant.
 2018-04-15 12:02:51 -04:00
richard.coates
ca0db01f0f Correct to instant. 2018-04-15 17:58:25 +02:00
theelk801
10ccae560f
Merge pull request #4766 from rscoates/implementDarkBargain 
Implement Dark Bargain
 2018-04-15 11:57:20 -04:00
richard.coates
ecb2d7cbfe Implement Dark Bargain 2018-04-15 17:45:49 +02:00
theelk801
40de461782
Merge pull request #4765 from keelahnkhan/add-sanctum-spirit 
Added Sanctum Spirit to Dominaria
 2018-04-15 11:43:31 -04:00
Thomas Contis
7044024dc6 Merge remote-tracking branch 'origin/master' 2018-04-15 11:24:16 -04:00
Thomas Contis
97c6c037b2 Implemented Volcanic Wind (Mercadian Masques) 2018-04-15 11:23:25 -04:00
Keelan Tucker
46a468588a Added Sanctum Spirit to Dominaria 2018-04-15 10:54:14 -04:00
Thomas Contis
163df4eb77 Used Sets in Word of Undoing 2018-04-15 10:10:49 -04:00
Thomas Contis
07fd93a6ef Implemented Woolly Spider (Ice Age) 2018-04-15 10:10:49 -04:00
Thomas Contis
cb3b531aee Implemented Word of Undoing (Ice Age) 2018-04-15 10:10:49 -04:00
Thomas Contis
279759078c Used Sets in Word of Undoing 2018-04-15 08:55:22 -04:00
spjspj
33be5db065
Merge pull request #4764 from spjspj/master 
Minor revert.
 2018-04-15 21:49:19 +10:00
spjspj
0ffd895be9 Minor revert. 2018-04-15 20:58:04 +10:00
spjspj
b7b70c2aec
Merge pull request #4761 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-15 19:41:40 +10:00