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

20019 commits

This branch
This branch
All branches
Author SHA1 Message Date
Justin Herlehy
53cb5ae478 Fix for Giedon of the Trials emblem. 
Resolves #3179
 2017-07-06 13:01:47 -07:00
Devon Richards
ba80bf9227 Merge pull request #6 from ruler501/master 
Merge Master In
 2017-07-06 09:21:46 -05:00
Devon Richards
4a70c38823 Merge pull request #5 from magefree/master 
Merge remote in
 2017-07-06 09:20:55 -05:00
ingmargoudt
5cfef7f481 Merge pull request #3606 from ingmargoudt/issue-3604 
added Mycosynth Lattice test for #3604
 2017-07-06 02:10:57 +02:00
igoudt
a422c0a4d8 added Mycosynth Lattice test for #3604 2017-07-06 02:10:04 +02:00
Jeff
90be56dde9 - Fixed the trigger phase in God-Pharaoh's Gift. 2017-07-05 16:53:44 -05:00
Jeff
d861714177 - Added God-Pharaoh's Gift. [HOU] 2017-07-05 16:15:29 -05:00
Jeff
f1cc879edd - Added Ifnir Deadlands. [HOU] 2017-07-05 14:46:13 -05:00
Jeff
05c4c558d0 - Added Graven Abomination. [HOU] 2017-07-05 12:06:04 -05:00
spjspj
74dc8994f3 Merge pull request #3605 from spjspj/master 
Implement Nissa's Encouragement (HOU)
 2017-07-06 01:59:54 +10:00
spjspj
3a9b2b2243 Implement Nissa's Encouragement (HOU) 2017-07-06 01:59:07 +10:00
ciaccona007
e211111097 Implement 13 HOU cards 2017-07-05 10:20:57 -04:00
Lazar
5b50165338 banewhip punisher implementation (#3598) 2017-07-05 09:09:30 -05:00
Lazar
ec9564984d ammit eternal impl + tested (#3595) 
* ammit eternal impl + tested

* fixed combat damage to player
 2017-07-05 09:05:15 -05:00
spjspj
b0d3d15c80 Merge pull request #3602 from spjspj/master 
Implement 1 card (HOU)
 2017-07-05 23:25:14 +10:00
spjspj
22a192fb3c Implement 1 card (HOU) 2017-07-05 23:24:37 +10:00
spjspj
387e66883d Merge pull request #3601 from spjspj/master 
Implement 1 card (HOU)
 2017-07-05 22:46:29 +10:00
spjspj
f3fb7a522e Implement 1 card (HOU) 2017-07-05 22:45:52 +10:00
fireshoes
6286b12278 update HOU 2017-07-05 01:08:10 -05:00
LevelX2
f5c925d26c [HOU] Added Imaginary Threats. 2017-07-05 07:58:46 +02:00
LevelX2
80fde88cae [HOU] Added Hour of Promise.. 2017-07-05 07:15:57 +02:00
ciaccona007
23e6be8ca9 Implement 14 HOU cards 2017-07-05 00:35:45 -04:00
spjspj
6273523eee Merge pull request #3596 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-05 07:54:54 +10:00
spjspj
29eb1f478f Implement 2 cards (HOU) 2017-07-05 07:53:59 +10:00
ingmargoudt
3c874b47f4 Merge pull request #3593 from ciaccona007/master 
Implement 2 HOU cards
 2017-07-04 21:57:57 +02:00
ingmargoudt
d45f16aab9 Merge pull request #3594 from ingmargoudt/hou 
Hou cards
 2017-07-04 21:57:09 +02:00
igoudt
8f0e043361 added Magmaroth (HOU) 2017-07-04 21:55:24 +02:00
igoudt
1afcebc51a change subtype viashivan dragon 2017-07-04 21:54:43 +02:00
igoudt
9fb04dc33c manticore elemental 2017-07-04 21:54:24 +02:00
igoudt
5bb1311a6e added Magmaroth (HOU) 2017-07-04 21:53:43 +02:00
igoudt
1792d98b1a fix ability text 2017-07-04 21:42:05 +02:00
igoudt
a6081e1481 added Manticore Elemental (HOU) 2017-07-04 21:41:44 +02:00
igoudt
f79b534950 granitic titan (HOU) 2017-07-04 20:52:20 +02:00
igoudt
dbd06d7e78 gift of strength (HOU) 2017-07-04 20:47:21 +02:00
ciaccona007
34319b6f60 Implement 2 HOU cards 2017-07-04 14:20:17 -04:00
emerald000
38c35f0fcb Fix gen-existing-cards-by-set.pl for split cards. 2017-07-04 13:42:01 -04:00
emerald000
38c2878962 Fix Hour of Devastation set file errors. 2017-07-04 13:24:57 -04:00
emerald000
f2febc9957 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/CountervailingWinds.java
 2017-07-04 13:05:36 -04:00
emerald000
a219df9ebe Merge commit. 2017-07-04 13:01:50 -04:00
emerald000
fe95fc3b43 [HOU] Added 5 blue cards. 
Aven Reedstalker, Countervailing Winds, Cunning Survivor, Eternal of Harsh Truths and Hour of Eternity.
 2017-07-04 12:57:06 -04:00
ingmargoudt
01d36d1819 Merge pull request #3592 from ciaccona007/master 
Implement 9 HOU cards
 2017-07-04 17:57:54 +02:00
ingmargoudt
ae374063c1 Merge branch 'master' into master 2017-07-04 17:57:38 +02:00
ciaccona007
6baa978a48 Implement 2 cards 2017-07-04 11:49:11 -04:00
ciaccona007
4b28f5c994 Remove duplicates 2017-07-04 11:46:58 -04:00
ciaccona007
95c5264cb2 Implement Harrier Naga 2017-07-04 09:38:18 -04:00
ciaccona007
a80bf19dc4 Use {this} in text 2017-07-04 08:19:45 -04:00
spjspj
1ff86f2574 Merge pull request #3590 from spjspj/master 
Implement 1 cards (HOU)
 2017-07-04 22:10:34 +10:00
spjspj
60ef4ce0da Implement 1 cards (HOU) 2017-07-04 22:08:05 +10:00
spjspj
d0d311231f Merge pull request #3589 from spjspj/master 
Implement 1 cards (HOU)
 2017-07-04 19:29:47 +10:00
spjspj
1dbecd3d3e Implement 1 cards (HOU) 2017-07-04 19:29:00 +10:00