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

14731 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derek M
90dbd4edc0 Merge pull request #1854 from fenhl/patch-1 
Update card count in readme
 2016-04-12 17:49:55 -04:00
Marco-Marin
a356cd1649 Merge pull request #1835 from Marco-Marin/master 
First ever card after incorporating the Testing Process: Dwarven Catapult.
Tested from scratch (tho it worked the 1st time, so maybe most previous ones were not too shabby either :))
Also using this to test my learning of new Git CLI commands: "add ." and "add -u" seemed to do the trick.

PS: Nevermind the Oubliette changes, I'm doing a 'poor man's' versioning system to make sure my builds are working. ^_^
 2016-04-12 16:38:05 -03:00
MarcoMarin
a02f6a3c3a Testing Git commands with card: Dwarven Catapult 2016-04-12 16:27:47 -03:00
Derek M
5a5175355b Merge pull request #1856 from drmDev/master 
updated files for set Welcome Deck 2016. still need update java
 2016-04-12 14:11:28 -04:00
drmDev
c9ed58de86 updated files for set Welcome Deck 2016. still need update java 2016-04-12 14:10:54 -04:00
Derek M
66263e155b Merge pull request #1852 from fenhl/packs-disdain 
Implement Pack's Disdain
 2016-04-12 13:16:53 -04:00
Fenhl
74b5e85a3e Fix continuous effect creation in Pack's Disdain 2016-04-12 16:57:28 +00:00
Fenhl
a5f6fb0d47 Update card count in readme 
I counted the unique cards using [http://ct-magefree.rhcloud.com/cards](http://ct-magefree.rhcloud.com/cards) and the total cards by counting the files in Mage.Sets. The exact numbers are 15699 and 26000 respectively.

Shadowmoor, the regular set that immediately preceded Eventide, is 100% implemented according to the tracking tool, so I changed the relevant part of the readme.
 2016-04-12 16:13:04 +00:00
Derek M
267d19f71c Merge pull request #1853 from fenhl/canopy-crawler 
Fix activated ability of Canopy Crawler
 2016-04-12 11:12:40 -04:00
Fenhl
5d341af554 Fix activated ability of Canopy Crawler 2016-04-12 13:50:32 +00:00
Fenhl
899122a170 Implement Pack's Disdain 2016-04-12 13:45:45 +00:00
Derek M
c3acf201ce Merge pull request #1851 from drmDev/master 
Tunnel Vision implemented
 2016-04-12 09:10:13 -04:00
drmDev
d707e03807 Tunnel Vision implemented 2016-04-12 09:09:49 -04:00
Derek M
9c202a2902 Merge pull request #1850 from halljared/master 
Fixes #1836
 2016-04-12 08:18:15 -04:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
9365b36387 Merge pull request #1849 from spjspj/master 
spjspj - Implement Kill Switch (NMS) -
 2016-04-12 11:38:42 +10:00
spjspj
bc44851b62 spjspj - Implement Kill Switch (NMS) - 
Implemented using a new type of condition 'SourceTappedBeforeUntapStepCondition'
 2016-04-12 11:29:55 +10:00
Derek M
262de17d17 Merge pull request #1847 from drmDev/master 
Earthbind implementation
 2016-04-11 19:55:49 -04:00
drmDev
d735c4e41b Earthbind implementation 2016-04-11 19:55:18 -04:00
Derek M
6775c9bc97 Merge pull request #1846 from drmDev/master 
Champion bug fixes
 2016-04-11 17:07:15 -04:00
drmDev
f2d5462c97 Champion bug fixes 2016-04-11 17:06:14 -04: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
Derek M
90507f4c55 Merge pull request #1844 from drmDev/master 
SilentSkimmer and PyreHound bug fixes
 2016-04-11 11:42:18 -04:00
drmDev
57a992649e SilentSkimmer and PyreHound bug fixes 2016-04-11 11:41:55 -04: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