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

15592 commits

This branch
This branch
All branches
Author SHA1 Message Date
drmDev
1e13276525 Fixed Tamiyo test. confirmed bug 2016-07-12 09:20:27 -04:00
drmDev
bb3828ce0c Distember of the Blood [EMN] bug fix 2016-07-12 08:57:09 -04:00
Derek M
0f8d25fb41 Merge pull request #2068 from drmDev/master 
WIP JUnit test for Tamiyo Field Researcher reported bug
 2016-07-12 08:55:44 -04:00
drmDev
38fd982501 WIP JUnit test for Tamiyo Field Researcher reported bug 2016-07-12 07:01:31 -04:00
LevelX2
087b3ebd2c Merge pull request #2067 from JOAC69/GiselaFix 
Fix meld trigger text for Gisela, the Broken Blade
 2016-07-12 10:47:33 +02:00
Eric McVicker
9a069edc44 Fix meld trigger text for Gisela, the Broken Blade 2016-07-12 02:38:20 -05:00
LevelX2
f3f852bab7 Xmage 1.4.13v1 2016-07-12 08:00:15 +02:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
emerald000
c322b9adad [EMN] Fixed melding not working after the meld pieces return to the battlefield. 
Such as returning from under an Oblivion Ring.
 2016-07-11 22:28:24 -04:00
fireshoes
bc8d3f99a9 Merge origin/master 2016-07-11 21:16:26 -05:00
fireshoes
c698ce5630 [EMN] Various fixes. 2016-07-11 21:13:32 -05:00
drmDev
7261452413 SacrificeAllTriggeredAbility bug fix. fixes #1736 2016-07-11 22:04:34 -04:00
Quercitron
91f74ced1f Add downloading of double-faced cards from the mythicspoiler.com 2016-07-12 03:31:08 +03:00
Quercitron
c334d98564 [EMN] Fix filter by name in the MeldCondition. 2016-07-12 02:18:36 +03:00
Quercitron
99a2f4b323 * Borrowed Hostility - Fixed that all controlled creatures were buffed with the first mode. 2016-07-12 02:02:52 +03:00
fireshoes
bf0d920e8c [EMN] Cleaned up some tooltip text on white cards, fixed a couple of card names. 2016-07-11 16:37:12 -05:00
LevelX2
fa32925b28 Merge origin/master 2016-07-11 22:55:34 +02:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
fireshoes
69dbff9cb3 Added upcoming promo cards. Worked on mtg-cards-data.txt organization (alphabetizing by set name and removing duplicate sets). 2016-07-11 13:56:14 -05:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
LevelX2
8a7a1e3dab Merge origin/master 2016-07-11 18:56:16 +02:00
LevelX2
2bdb3635a2 Serum Tank - Fixed some bugs. 2016-07-11 18:55:49 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
0f122ff154 Merge pull request #2062 from CountAndromalius/SerumTank 
Implementing Serum Tank (Mirrodin and Planechase)
 2016-07-11 18:22:47 +02:00
LevelX2
54ad8a6ec0 MeldCard prevented possible NPE during test project build. 2016-07-11 17:10:14 +02:00
fireshoes
436942ccff [EMN] Minor spelling fix. 2016-07-11 09:04:46 -05:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
CountAndromalius
3c52670d61 Implementing Serum Tank (Mirrodin and Planechase) 2016-07-11 02:27:38 -03:00
Samuel Sandeen
bf613572e9 Fix another merge artifact. 2016-07-10 19:07:53 -04:00
Samuel Sandeen
c7cdd792d0 Remove Merge conflict artifacts. 2016-07-10 19:05:41 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
Samuel Sandeen
8fe5bf4fbb Update the uses of PreventAllDamageByAllPermanentsEffect to use the new name. 2016-07-10 18:55:58 -04:00
Samuel Sandeen
3f0ff01bbc Add files via upload 2016-07-10 18:47:32 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
LevelX2
cb91282f9e [EMN] Some fixes to Dark Salvation, Eldrich Moon, Make Mischief. 2016-07-10 22:02:56 +02:00
LevelX2
01c21723fd Merge pull request #2060 from magefree/revert-2029-audio_threadpool 
Revert "Use a dedicated thread pool for audio"
 2016-07-10 22:01:26 +02:00
LevelX2
8e76430d07 Revert "Use a dedicated thread pool for audio" 2016-07-10 22:01:06 +02:00
LevelX2
09273f284d [EMN] Set Hanwar the Writhing Township to nightSide 2016-07-10 21:07:59 +02:00
LevelX2
772abd9311 Merge origin/master 2016-07-10 20:58:51 +02:00
LevelX2
1e120bdeaa [EMN] Added Dark Salvation and a workaroung version of Slayer's Cleaver. The meld cards without meld. 2016-07-10 20:58:26 +02:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
de0b66240f [EMN] Added 3 black cards. 2016-07-10 11:11:56 +02:00
LevelX2
0017f7a458 [EMN] Added 8 black cards. 2016-07-10 10:43:26 +02:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
fd55feee17 [EMN] Added the missing multicolor cards. 2016-07-10 10:09:06 +02:00
drmDev
55aae9910e fixes #2054 2016-07-10 03:27:33 -04:00
drmDev
e317719e16 [EMN] some black cards implemented 2016-07-09 19:15:04 -04:00
drmDev
4423f1e7fc the real [EMN] commit... 2016-07-09 16:48:33 -04:00