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

14736 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derek M
86528ede16 Merge pull request #1831 from drmDev/master 
Card implementations Epic Struggle, Primitive Etchings
 2016-04-09 05:53:34 -04:00
drmDev
80a0134120 Card implementations Epic Struggle, Primitive Etchings 2016-04-09 05:53:00 -04:00
LevelX2
f51302a780 Merge origin/master 2016-04-09 11:45:05 +02:00
LevelX2
278558c925 * Ghazban Ogre - Fixed various bugs (fixes #1828). 2016-04-09 11:44:35 +02:00
Derek M
a600228194 Merge pull request #1830 from drmDev/master 
Life Burst card implemented
 2016-04-09 05:26:24 -04:00
drmDev
f5843a5498 Life Burst card implemented 2016-04-09 05:26:06 -04:00
Derek M
be5e4c248e Merge pull request #1825 from drmDev/master 
Vanishing card implemented
 2016-04-09 04:45:49 -04:00
drmDev
266ba0643e Pariahs Shield implemented 2016-04-09 04:43:10 -04:00
drmDev
214453ee58 Merge remote-tracking branch 'upstream/master' 2016-04-09 04:23:04 -04:00
LevelX2
3fbcfca1ee xmage 1.4.10v1 2016-04-09 00:05:12 +02:00
drmDev
e6d36d9523 Vanishing card implemented 2016-04-08 17:13:04 -04:00
Derek M
cb4f94fe67 Merge pull request #1824 from drmDev/master 
Gelid Shackles implementation. PlayerStub fix
 2016-04-08 15:56:14 -04:00
drmDev
7c8ac25abc Gelid Shackles implementation. PlayerStub fix 2016-04-08 15:55:25 -04:00
Derek M
aa2b61ad83 Merge pull request #1823 from Marco-Marin/master 
MM reporting for duty! :)
 2016-04-08 11:44:02 -04:00
MarcoMarin
73caa5c869 Revert "Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total"" 
This reverts commit 342141dfe0f40b6ae1bbef4fd609bd3afc8ebb86.
 2016-04-08 12:09:03 -03:00
MarcoMarin
0403c7f178 Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total" 
This reverts commit 663e52bf7bf2e5d1e80fc5eb3700fe328d18b5f1.
 2016-04-08 12:04:56 -03:00
MarcoMarin
beb1856542 Maybe I forgot to commit the file? (yes, it fixed the counters) 
fixed Uncle Istvan
Another batch of cards:
 2016-04-08 12:02:11 -03:00
LevelX2
bc4999a698 * Jace, Unraveler of Secrets - Fixed that the emblem did never counter a spell (fixes #1739). 2016-04-08 16:59:30 +02:00
MarcoMarin
31c13f6166 Another batch of 6(14) cards ready. 2016-04-08 11:57:57 -03:00
MarcoMarin
b1ed8378c0 First few cards from new author. 
Compilation is broken tho, because CounterType enum isn't accepting my
new counter for Cyclone.
 2016-04-08 11:54:50 -03:00
LevelX2
2d18e66a8f Merge origin/master 2016-04-08 15:46:03 +02:00
LevelX2
e4dcb35afa * Fixed a problem with the check what spells are castable for a player. 2016-04-08 15:45:12 +02:00
Derek M
7190788d65 Merge pull request #1817 from Wehk/master 
Added old cards, and fixed Fallowmage's abiltiy to "may"
 2016-04-08 09:32:15 -04:00
Wehk
ae6383c850 Added old cards, and fixed Fallowsage's ability to "may". 2016-04-08 15:25:45 +02:00
LevelX2
f56e9b1de1 * Bloodlord of Vaasgoth - Fixed that it did not apply bloodthirst properly to other vampires (fixes #1792). 2016-04-08 13:45:12 +02:00
Derek M
cdb37813ca Merge pull request #1821 from drmDev/master 
another ZoneGroupChangeEvent NPE fix - Sidisi
 2016-04-08 00:25:01 -04:00
drmDev
e1f145ab19 another ZoneGroupChangeEvent NPE fix - Sidisi 2016-04-08 00:24:33 -04:00
Derek M
e57f5cc12f Merge pull request #1820 from drmDev/master 
Oracle Text fixes. NPE fixes
 2016-04-08 00:17:28 -04:00
drmDev
04de56860a Oracle Text fixes. NPE fixes 2016-04-08 00:16:12 -04:00
Derek M
d3f1f811ce Merge pull request #1818 from drmDev/master 
Neckbreaker fix. typo fix
 2016-04-07 20:04:55 -04:00
drmDev
55471c9b48 Neckbreaker fix. typo fix 2016-04-07 20:04:32 -04:00
Anders
c1f3e499d7 2016-04-08 00:22:30 +02:00
LevelX2
481d990b41 Added test for Bloodlord of Vaasgoth bug (#1792). 2016-04-08 00:18:12 +02:00
spjspj
319268b517 Merge pull request #1816 from spjspj/master 
spjspj - Implement Corrupted Grafstone (SOI)
 2016-04-08 08:04:57 +10:00
spjspj
9bdf4ca753 spjspj - Implement Corrupted Grafstone (SOI) 2016-04-08 07:59:15 +10:00
LevelX2
f688980573 Phyrexian Dreadnought - Fixed that it can't be sacrificed if it's phased out. 2016-04-07 23:41:16 +02:00
LevelX2
68fdcddd32 Days Undoing - Fixed card movement. 2016-04-07 23:37:30 +02:00
LevelX2
a99eef5bf4 Briarbridge Patrol - Fixed that it doesn't trigger from noncombat damage (fixes #1809). 2016-04-07 23:10:42 +02:00
LevelX2
fca3b9a42a Fixed usable zone check for transformmable permanents (fixes #1800). 2016-04-07 22:56:32 +02:00
LevelX2
24faec3d12 The Gitrog Monster - Fixed possible null pointer exception. 2016-04-07 22:34:20 +02:00
LevelX2
94d216956c Merge pull request #1813 from Styxo/master 
Added Rebellion of the Flamekin and Elemental Shaman Token, refactore…
 2016-04-07 20:08:47 +02:00
Styxo
23714d8634 Added Rebellion of the Flamekin and Elemental Shaman Token, refactored Hostility and Hearthcage Giant to use the token as well 2016-04-07 19:50:29 +02:00
spjspj
1e48156223 Merge pull request #1811 from spjspj/master 
spjspj - Print out command to edit the created file from gen-card.pl
 2016-04-07 22:02:06 +10:00
spjspj
2e2a36395a spjspj - Print out a quick way to edit the file name from gen-card.pl 2016-04-07 21:55:42 +10:00
Derek M
32a8f3ddfc Merge pull request #1808 from drmDev/master 
Briarbridge patrol test for bug
 2016-04-07 02:25:42 -04:00
drmDev
955781d171 Briarbridge patrol test for bug 2016-04-07 02:25:32 -04:00
spjspj
7c06ba96f0 Merge pull request #1806 from spjspj/master 
spjspj - Further fixes for useFirstManaAbility
 2016-04-07 15:35:38 +10:00
spjspj
bfc66ff3f3 spjspj - Further fixes for useFirstManaAbility 2016-04-07 15:29:18 +10:00
fireshoes
2778ae2381 Added Legendary Cube April 2016. 2016-04-06 22:41:15 -05:00
Derek M
13d915a728 Merge pull request #1799 from halljared/master 
Fixes 1796
 2016-04-06 23:26:53 -04:00