Commit graph

14660 commits

Author SHA1 Message Date
MarcoMarin
4c25816be1 midway through FEM + fixed Oubliette, Tawnos Coffin 2016-04-19 12:50:48 -03:00
MarcoMarin
a02f6a3c3a Testing Git commands with card: Dwarven Catapult 2016-04-12 16:27:47 -03:00
MarcoMarin
7149ecd2dd oubliette difference is blocking me from pulls from origin2 2016-04-11 17:26:32 -03:00
MarcoMarin
318c18fb34 oubliette difference is blocking me from pulls from origin 2016-04-11 17:24:31 -03:00
MarcoMarin
d045d16a20 Oubliette:
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
2016-04-11 16:20:50 -03:00
MarcoMarin
013c506fac Oubliette:
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
2016-04-11 15:01:01 -03:00
MarcoMarin
7505365425 Merge remote-tracking branch 'upstream/master' 2016-04-11 12:10:34 -03:00
LevelX2
2f4232476e * Changing some Target inheritance to fix AI Target handling (e.g. Loaming Shaman). 2016-04-11 17:00:28 +02:00
Derek M
4403f919a1 Merge pull request #1839 from drmDev/master
WeirdingWood fix. Gloom and VolcanicEruption impl
2016-04-10 11:19:53 -04:00
drmDev
b0c0ca351c WeirdingWood fix. Gloom and VolcanicEruption impl 2016-04-10 11:19:06 -04:00
LevelX2
386c7168d0 * Dromoka's Command - Fixed that P/T changes resulting of a sacrifice of an enchantment were not applied before the fighting effect was applied. 2016-04-10 10:56:13 +02:00
LevelX2
0cf3ab9d78 * Oath of Nissa - Fixed target selection mot working for AI players. 2016-04-10 10:30:23 +02:00
spjspj
635f0244dd Merge pull request #1837 from spjspj/master
Fix possible NPE for Martyr's Bond
2016-04-10 13:01:43 +10:00
spjspj
065a202c1d Fix possible NPE for Martyr's Bond 2016-04-10 13:00:44 +10:00
MarcoMarin
a295964b04 Antiquities is complete. (except for antes, banding and reverse polarity)
27 unique cards, 68 total;
bringing ATQ from 63,53% to 94.12% and ARN to 92.31%

+ Fixed a detail on Oubliette (tho bugs may remain)
+ Added 1 last card to ARN, now that I know about Watchers ;)
2016-04-09 13:37:11 -03:00
Derek M
1be18a0188 Merge pull request #1834 from drmDev/master
LightningSurge implemented
2016-04-09 12:04:35 -04:00
drmDev
fc0197186b LightningSurge implemented 2016-04-09 12:04:15 -04:00
spjspj
e1ad5e7270 Merge pull request #1833 from spjspj/master
spjspj - Implement Martyr's Bond (CMD)
2016-04-10 01:44:04 +10:00
spjspj
9009375bf4 spjspj - Implement Martyr's Bond (CMD) 2016-04-10 01:37:49 +10:00
Derek M
cedb3130bc Merge pull request #1832 from drmDev/master
Millikin and EmptytheCatacombs implemented
2016-04-09 07:36:13 -04:00
drmDev
1eae61a752 Millikin and EmptytheCatacombs implemented 2016-04-09 07:35:33 -04:00
LevelX2
d288c41396 Merge origin/master 2016-04-09 13:13:59 +02:00
LevelX2
ed3b63652f MTG Cube - Fixed wrong name of Fire // Ice. 2016-04-09 13:13:18 +02:00
LevelX2
d99d35b9c9 Legendary Cube 2016 fixed wrong card name of Opalescence. 2016-04-09 13:12:50 +02:00
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