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

11269 commits

Author SHA1 Message Date
ciaccona007
f1010bd0b7 Implement Blur of Blades 2017-07-03 23:09:16 -04:00
ciaccona007
f19dc1e0e8 Implement Bitterbow Sharpshooters 2017-07-03 22:57:04 -04:00
ciaccona007
b4ad0c5f4a Implement Aven Reedstalker 2017-07-03 22:54:56 -04:00
ciaccona007
86bc162c83 Implement Devotee of Strength 2017-07-03 22:50:07 -04:00
ciaccona007
3b3f2b10ac Add Devotee of Strength to HOU.java 2017-07-03 22:49:28 -04:00
ciaccona007
281841e487 Implement Aerial Guide 2017-07-03 22:35:05 -04:00
Imagery-Wizard
f8ec345414 Add Aerial Guide to HourOfDevastation.java 2017-07-03 18:32:50 -04:00
Imagery-Wizard
e9a04f53b5 Implement Aerial Guide 2017-07-03 18:32:11 -04:00
spjspj
8b58fb6b37 Merge pull request #3580 from spjspj/master 
Implement 1 HOU card
 2017-07-04 07:46:40 +10:00
spjspj
70c9163d6a Fix 1 card (HOU) 2017-07-04 07:44:02 +10:00
spjspj
09ed2370ba Implement 1 card (HOU) 2017-07-04 07:25:41 +10:00
igoudt
3e393a83bc Merge https://github.com/magefree/mage into hou 2017-07-03 23:17:40 +02:00
igoudt
2c17bbf006 hou cards 2017-07-03 23:17:17 +02:00
emerald000
4f281eeb1d [HOU] Added 3 white cards. 
Crested Sunmare, God-Pharaoh's Faithful and Mummy Paramount.
Fix Wayward Servant not counting Tribals.
Remove Consign // Oblivion as it was incomplete.
 2017-07-03 16:50:38 -04:00
spjspj
b34d2318fe Merge branch 'master' into master 2017-07-03 23:50:54 +10:00
spjspj
610be4ed2c Merge pull request #3565 from nickymikail/master 
Oketra's Avenger
 2017-07-03 23:44:42 +10:00
spjspj
1e1321be14 Implement 1 card (HOU) 2017-07-03 23:43:23 +10:00
spjspj
422afec3fe Implement 1 card (HOU) 2017-07-03 20:58:42 +10:00
spjspj
01ae2c0e6b Implement 1 card (HOU) 2017-07-03 20:38:42 +10:00
spjspj
6ba9edb799 Merge branch 'master' into master 2017-07-03 20:26:46 +10:00
spjspj
c1f7a10867 Implement 1 card (HOU) 2017-07-03 20:25:04 +10:00
spjspj
519c92a34b Merge pull request #3574 from spjspj/master 
Implement 5 cards (HOU)
 2017-07-03 19:44:00 +10:00
spjspj
7418c01bed Implement 5 cards (HOU) 2017-07-03 19:42:53 +10:00
LevelX2
a86f930117 Merge origin/master 2017-07-03 08:59:25 +02:00
LevelX2
a3ea1a8f49 [HOU] Added 2 cards. 2017-07-03 08:58:48 +02:00
nickymikail
3debc25a56 suggested fixes 2017-07-02 10:04:34 -07:00
spjspj
d8dfda2c25 Merge pull request #3572 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-03 00:23:54 +10:00
spjspj
c3c09eab2c Implement 2 cards (HOU) 2017-07-03 00:23:05 +10:00
Archer262
a8235e414a Dutiful Servants 2017-07-02 10:04:21 -04:00
Archer262
e64a7ad5f7 Djeru's Renunciation 2017-07-02 10:02:17 -04:00
Archer262
fe921f4d00 Disposal Mummy 2017-07-02 09:57:02 -04:00
Archer262
aa1f401a25 Dauntless Aven 2017-07-02 09:45:50 -04:00
igoudt
7d8ff852f6 Merge https://github.com/magefree/mage 2017-07-02 15:39:36 +02:00
igoudt
7028f8ee3d implement Chaos Maw 2017-07-02 15:36:18 +02:00
Archer262
126a95bd1c Aven of Enduring Hope 2017-07-02 08:58:37 -04:00
spjspj
75cb28374b Merge pull request #3571 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-02 22:48:58 +10:00
spjspj
e0464635c4 Implement 2 cards (HOU) 2017-07-02 22:48:00 +10:00
Archer262
310ac060e2 Format Fix 2017-07-02 08:32:17 -04:00
igoudt
e302e5f302 added dutiful servants, rampagin hippo, scrounger of souls 2017-07-02 13:54:10 +02:00
igoudt
b573d72883 added UT, fix small bug on Hour of Revelation 2017-07-02 13:08:03 +02:00
spjspj
dac9f4f4a8 Implement Tragic Lesson (HOU) 2017-07-02 17:11:48 +10:00
Archer262
891cf38a3b Act Of Heroism 2017-07-02 00:19:17 -04:00
spjspj
a1dcaa6a89 Implement 2 HOU cards 2017-07-02 13:49:33 +10:00
Archer262
3cd5309317 Merge pull request #1 from magefree/master 
Merge Update
 2017-07-01 22:47:14 -04:00
spjspj
4a29f7a0f0 Implement Vizier of the Anointed (HOU) 2017-07-02 12:46:06 +10:00
spjspj
2b4bf16cec Implement 2 HOU cards 2017-07-02 12:15:05 +10:00
Archer262
c6291316cd Added Beneath the Sands [HOU] 2017-07-01 22:14:50 -04:00
spjspj
d66663191c HOU - 3 split cards already implemented 2017-07-02 11:18:55 +10:00
nickymikail
186fdb0cac Ruin Rat 2017-07-01 16:15:58 -07:00
nickymikail
f80bcfdfa2 Lurching Rotbeast 2017-07-01 15:02:15 -07:00
nickymikail
81de1f5e65 Oketra's Avenger 2017-07-01 14:43:47 -07:00
spjspj
0bfcd24a8f Implement 1 cards (HOU) 2017-07-02 00:19:38 +10:00
spjspj
7d9886dd98 Implement 3 cards (HOU) 2017-07-02 00:08:39 +10:00
spjspj
3ebb508b94 Implement Sidewinder Naga (HOU) (and add some reprints) 2017-07-01 23:02:34 +10:00
Jeff
87b0b95036 - Text fix. 2017-06-30 17:15:37 -05:00
Jeff
67415c0faf - Added Fraying Sanity. [HOU] 2017-06-30 17:10:02 -05:00
Jeff
ade4e01a77 - Added Gilded Cerodon. [HOU] 2017-06-30 11:25:51 -05:00
spjspj
68d27cd773 Merge branch 'master' into master 2017-06-30 23:52:21 +10:00
spjspj
57caa02091 Implement Sunset Pyramid (HOU) 2017-06-30 23:40:19 +10:00
Jeff
0eb054599a - Added Fervent Paincaster. [HOU] 2017-06-30 08:24:29 -05:00
LevelX2
f1e3bcfd01 Merge origin/master 2017-06-30 15:05:32 +02:00
LevelX2
77af24485b [HOU] Added 3 split cards. 2017-06-30 15:04:56 +02:00
Jeff
5453172953 - Fixed a card name. 2017-06-30 08:04:05 -05:00
Jeff
775f50fe6c - Little refactor. 2017-06-29 16:57:32 -05:00
Jeff
130f5093de - Added Earthshaker Khenra. [HOU] 2017-06-29 16:45:26 -05:00
Jeff
3f53e5fee5 - Added Crook of Comdemnation. [HOU] 2017-06-29 15:26:52 -05:00
LevelX2
970c556557 Merge origin/master 2017-06-29 17:56:15 +02:00
LevelX2
c8e1a9d854 [HOU] Added 4 cards. 2017-06-29 17:55:48 +02:00
LevelX2
74d7bb17c3 Merge pull request #3546 from lilhomie96/master 
eighth / ninth edition box set
 2017-06-29 15:24:15 +02:00
spjspj
3b1fd8a955 Merge pull request #3556 from spjspj/master 
Implement Uncage The Menagerie (HOU)
 2017-06-29 22:57:31 +10:00
spjspj
d43197c0cc Implement Uncage The Menagerie (HOU) 2017-06-29 22:56:06 +10:00
igoudt
b7badc49cf Merge https://github.com/magefree/mage 2017-06-29 12:21:55 +02:00
igoudt
a72fe69018 fixes #3537 2017-06-29 12:21:40 +02:00
spjspj
d4a76bb381 HOU ChampionOfWits 2017-06-29 15:44:54 +10:00
lilhomie96
a450cf8ed9 Ninth Edition Box fixed Ninth Edition 2017-06-28 22:44:11 -05:00
spjspj
2b24d95ac5 HOU ChampionOfWits 2017-06-29 09:44:54 +10:00
Jeff
d296934c03 - Fixed Bug #3539 2017-06-28 17:02:32 -05:00
Jeff
d58a438ba9 - Fixed Bug #3541. Nomad Mythmaker. 2017-06-28 16:33:26 -05:00
Jeff
b39c61eff3 - Added Chaosphere, Goblin Shrine, and Kudzu. All requested. 2017-06-28 14:44:28 -05:00
LevelX2
c11d77e28e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-28 17:07:04 +02:00
LevelX2
886022fd19 [HOU] Added 4 cards and some fixes. 2017-06-28 17:03:26 +02:00
spjspj
afa0acd3f4 Implement 2 cards (HOU) 2017-06-28 22:50:31 +10:00
spjspj
8d91cff617 Implement Avid Reclaimer (HOU) 2017-06-28 18:41:09 +10:00
emerald000
130a123052 Remove useless parameter of ExertSourceCost. 2017-06-27 23:07:24 -04:00
lilhomie96
892fb8c70d Merge pull request #1 from magefree/master 
a
 2017-06-27 13:50:15 -05:00
LevelX2
feec4269eb Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-27 17:37:37 +02:00
LevelX2
e6ce3e168a [HOU] Added 4 white cards and some fixes. 2017-06-27 17:29:51 +02:00
spjspj
6d35de829f Implement The Locust God (HOU) 2017-06-27 21:32:14 +10:00
spjspj
d95bd421fc Implement The Locust God (HOU) 2017-06-27 21:16:27 +10:00
spjspj
34bde8a61a Implement full art basics (HOU) 2017-06-27 20:21:33 +10:00
lilhomie96
de530f3025 eighth edition box set 2017-06-27 01:33:59 -05:00
lilhomie96
ff5ce7fea0 Delete EighthEditionBox.java 2017-06-26 22:42:26 -05:00
lilhomie96
f8465d3671 eighth edition box set 
7 cards
 2017-06-26 22:10:29 -05:00
spjspj
dae7530155 Merge branch 'master' into master 2017-06-26 23:16:50 +10:00
spjspj
64524a8c18 Implement The Scarab God (HOU) 2017-06-26 23:13:48 +10:00
emerald000
3388fce4c1 [HOU] Added Desert's Hold. 
Implemented OrCondition.
 2017-06-26 08:26:02 -04:00
emerald000
6ee570d5e7 [HOU] Added Angel of Condemnation. 
Implemented ExertSourceCost.
 2017-06-26 07:31:06 -04:00
spjspj
2681091bf2 Implement The Scorpion God (HOU) 2017-06-25 22:57:39 +10:00
spjspj
9aa7829010 Implement The Scorpion God (HOU) 2017-06-25 22:38:08 +10:00
spjspj
754b2bdfaf Implement The Scorpion God (HOU) + Fix for Unesh 2017-06-25 22:30:55 +10:00
spjspj
fc0b8ec9cb Merge branch 'master' into master 2017-06-25 21:35:37 +10:00
spjspj
67ce816381 Implement Unesh (HOU) 2017-06-25 21:33:06 +10:00
spjspj
cc368c3e1d Implement 2 cards from (HOU) 2017-06-25 21:31:12 +10:00
spjspj
8285f387db Implement Vizier of the True (HOU) 2017-06-25 20:09:50 +10:00
spjspj
e5611d1571 Merge pull request #3531 from spjspj/master 
Implement Vizier of the True (HOU)
 2017-06-25 20:07:46 +10:00
spjspj
b80aab0cfd Implement Vizier of the True (HOU) 2017-06-25 20:06:51 +10:00
LevelX2
f0dbc1da1c [HOU] Added 4 black cards. Some fixes. 2017-06-25 10:21:52 +02:00
spjspj
2db812400e Merge pull request #3525 from spjspj/master 
HOU - Two cards
 2017-06-24 23:46:13 +10:00
spjspj
0b443b08d9 Implement Wildfire Eternal (HOU) 2017-06-24 23:45:20 +10:00
LevelX2
128b972765 [HOU] Added 5 black cards. 2017-06-24 14:00:21 +02:00
spjspj
ed22eb158c Implement Zealot of the God Trump (HOU) 2017-06-24 20:03:43 +10:00
spjspj
724653728b HOU Reprints 2017-06-24 19:51:12 +10:00
spjspj
8371257889 Merge pull request #3523 from spjspj/master 
Implement Chandra's Defeat (HOU)
 2017-06-24 19:42:51 +10:00
spjspj
9dc866852d Implement Chandra's Defeat (HOU) 2017-06-24 19:42:09 +10:00
LevelX2
1210f9795a [HOU] Added Doomfall. 2017-06-24 11:33:53 +02:00
spjspj
7c90bbdd59 Implement Bontu's Last Reckoning (HOU) 2017-06-24 18:32:32 +10:00
spjspj
f04a95c63b Implement Solemnity (HOU) 2017-06-24 17:54:41 +10:00
igoudt
5bcaafd738 implemented Afflict + simple HOU cards 2017-06-24 01:13:42 +02:00
igoudt
ae640ee0b7 refactor duplicate code for playing lands from grave 2017-06-24 00:28:34 +02:00
igoudt
940b44ef81 fix wardSliver 2017-06-19 01:57:28 +02:00
igoudt
d63b241d54 implemented Eternalize Ability + Steadfast Sentinel 2017-06-19 01:03:12 +02:00
igoudt
441e96ebcc fix Gonti's Machinations #3499 2017-06-19 00:26:17 +02:00
Derek M
9904321bf6 Merge pull request #3511 from drmDev/master 
Shattering Spree fix closes #3509
 2017-06-18 13:12:55 -04:00
Derek Monturo
d8871deb6b Shattering Spree fix closes #3509 2017-06-18 13:12:32 -04:00
fireshoes
10a7babc71 Added HOU spoilers to mtg-cards-data.txt and implemented some simple cards and reprints. 2017-06-18 11:36:50 -05:00
Ludwig.Hirth
1fed506c2e * Cankerous Thirst - Fixed not fully working target handling (fixes #3500). 2017-06-18 10:50:31 +02:00
fireshoes
8cd12d6700 Added upcoming sets (Ixalan, Explorers of Ixalan, Rivals of Ixalan, Dominaria, Core 2019, DD: Merfolk vs Goblins, FTV: Transform, Masters 25, Unstable). 2017-06-14 11:08:23 -05:00
LevelX2
dd1eff68fe * Bruna, Light of Alabester - Fixed that the auras could not be moved to Bruno if it had shroud. (fixes #3484). 2017-06-11 15:53:16 +02:00
Derek Monturo
1ecf197732 Fixes #3492 Kamahal grants creatures, not all permanents trample 2017-06-11 08:59:52 -04:00
LevelX2
5cfb496899 * Storm Cauldron - Fixed that it wrongly also returned cards to hand that already left the battlefield (fixes #3487). 2017-06-11 10:44:41 +02:00
LevelX2
a22e89d26a * Added test for spells targeting players continue resolving even when those players leave the game (closes #1600). Problem no longer reproducable. 2017-06-11 10:30:56 +02:00
LevelX2
e7337f66b7 * Desertion - Fixed that the countered spell was wrongly moved to battlefield under owner control instad of Desertion caster control (fixed #3467). 2017-06-11 09:39:57 +02:00
Will Hall
9247d34d8a Fix #3481 - Swans of Bryn Argoll didn't realize an emblem can deal damage to it, so it couldn't find the source of the damage when Chandra, Torch of Defiance's emblem deals damage. 2017-06-09 20:34:14 -07:00
Will Hall
9adab5c8a6 Fix #3478 - Chandra, Pyromancer ultimate does not cast all 3 copies correctly 2017-06-09 18:43:10 -07:00
spjspj
dd4b160fee Merge pull request #3485 from spjspj/master 
Implement Taigam, Ojutai Master (C17)
 2017-06-10 00:53:07 +10:00
spjspj
a2f1c9b578 Implement Taigam, Ojutai Master (C17) 2017-06-10 00:52:10 +10:00
Styxo
e898db149a Added Parallectric Feedback, Invigorating Boon and Well of Knowledge 2017-06-09 14:00:05 +02:00
fireshoes
71460496e0 Updated collector numbers for Archenemy: Nicol Bolas (AKH cards in the set are not on Gatherer, so I appended their numbers after the other cards). Added remaining cards to Archenemy: Nicol Bolas set. 2017-06-07 11:03:35 -05:00
spjspj
aabb479a40 Merge pull request #3473 from spjspj/master 
Implement Wasitora, Nekoru Queen (C17)
 2017-06-07 00:42:38 +10:00
spjspj
1df0e62e00 Implement Wasitora, Nekoru Queen (C17) 2017-06-07 00:40:11 +10:00
spjspj
a48d584cdd Implement Wasitora, Nekoru Queen (C17) 2017-06-07 00:37:45 +10:00
fireshoes
52b4633340 Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01. 2017-06-05 16:00:13 -05:00
LevelX2
92b1cd27be Merge branch 'master' into samut-the-tested 2017-06-05 11:17:06 +02:00
LevelX2
003408046e Merge branch 'master' into nicol-bolas-god-pharoh 2017-06-05 11:16:03 +02:00
fireshoes
e762812a0b Added upcoming FNM promos. Added HOU spoilers to mtg-cards-data.txt. Added Masterpiece info to HOU set. 2017-06-04 22:31:01 -05:00
Will Hall
d989a0e013 Add Nicol Bolas, God-Pharoh 2017-06-04 19:26:26 -07:00
Will Hall
1850e650de Add loyalty cost to note for Samut's ultimate 2017-06-04 15:29:33 -07:00
Will Hall
ce521e2a1f Implement Samut, the Tested 2017-06-04 10:26:52 -07:00
spjspj
a371802cc0 Implement O-Kagachi, Vengeful Kami (C17) 2017-06-04 20:27:48 +10:00
spjspj
1ea8d3a4c6 Implement Ramos, Dragon Engine (C17) 2017-06-04 00:12:00 +10:00