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

19908 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
abb4576313 Merge origin/master 2017-07-08 18:43:14 +02:00
LevelX2
28cfbad76a [HOU] Nimble Obstructionist - Fixed that the Cycle ability blocked the game if no valid target to counter is on the stack (fixes +3615). 2017-07-08 18:42:50 +02:00
Imagery-Wizard
43b47690c5 Add 3 cards 2017-07-08 12:39:01 -04:00
Imagery-Wizard
ee2705a899 Merge upstream master 2017-07-08 12:35:49 -04:00
Imagery-Wizard
c62f73f8a8 Merge remote-tracking branch 'remotes/origin/master' 2017-07-08 12:31:08 -04:00
Imagery-Wizard
41a600a17e Add 2017-07-08 12:29:40 -04:00
spjspj
e408cb84ab Merge pull request #3616 from spjspj/master 
Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyrami…
 2017-07-09 02:21:20 +10:00
spjspj
fad8a31395 Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyramid, Crystalline Crawler, Infect combat damage) 2017-07-09 02:20:14 +10:00
LevelX2
16e7e3a346 [HOU] Sunset Pyramid - Fixed second activated ability not using correctly the Scry effect. 2017-07-08 18:09:42 +02:00
LevelX2
850e052bc7 Merge origin/master 2017-07-08 16:34:35 +02:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
spjspj
a4a8201ec2 Merge pull request #3613 from spjspj/master 
Minor refactor
 2017-07-08 23:54:37 +10:00
LevelX2
d1f61f48f1 XMage 1.4.24V0 2017-07-08 15:54:06 +02:00
LevelX2
c1c224c7ff [HOU] Some fixes. 2017-07-08 15:53:50 +02:00
spjspj
0afaa5c59c Minor refactor 2017-07-08 23:53:17 +10:00
LevelX2
3e61465d8e Merge pull request #3607 from ruler501/summerproject 
Fix Occasional Exception
 2017-07-08 14:34:35 +02:00
ingmargoudt
e72cf2a2e7 Merge pull request #3612 from ingmargoudt/master 
UT and streams
 2017-07-08 10:59:59 +02:00
igoudt
a167122459 loop to streams 2017-07-08 10:58:47 +02:00
igoudt
6eba170e3c UT for #3542 2017-07-08 10:58:47 +02:00
Achilles
1fddddcafa - Little refactor 2017-07-07 21:02:30 -05:00
spjspj
684c8baebe Merge pull request #3603 from ciaccona007/master 
Implement 13 HOU cards
 2017-07-08 11:20:17 +10:00
spjspj
16e732d950 Merge branch 'master' into master 2017-07-08 11:20:09 +10:00
Matthew Zulch
51595dbedf Act of Heroism fixes (#3608) 
* Adding test case for Act of Heroism

* Fixing Act of Heroism mana cost

* Adding can block additional creature effect that applies to spell/ability target rather than source

* Updating Act of Heroism to use new effect

* Removing redundant assertion, adding some comments
 2017-07-07 19:53:06 -05:00
Lazar
af79f02ac0 Apocalypsedemon (#3597) 
* ammit eternal impl + tested

* apocalpyse demon impl + test

* branch mess up

* cleanup

* added effect text

* removed existing cards
 2017-07-07 19:52:30 -05:00
Lazar
0792848f98 added couple lands (#3599) 
* added couple lands

* moved effect to own class
 2017-07-07 18:29:31 -05:00
Achilles
667dcb68af - Made the storage key unique 2017-07-07 17:57:28 -05:00
Jeff
128e25248f - Refactored Abandoned Sarcophagus. 2017-07-07 16:40:26 -05:00
Jeff
525652d41e - Fixed Imminent Doom. 2017-07-07 15:49:16 -05:00
fireshoes
45d03370ec Updated Masterpiece Series Amonkhet. 2017-07-07 14:48:26 -05:00
fireshoes
a1c574bfda Added Planechase Anthology, updated Media Inserts and Judge Promos 2017-07-07 14:27:29 -05:00
Jeff
ed761f824d - Added Imminent Doom. [HOU] 2017-07-07 13:50:14 -05:00
Jeff
4d87821497 - Added Abandoned Sarcophagus. [HOU] 2017-07-07 09:23:43 -05:00
spjspj
5e9ebcaa51 Merge pull request #3609 from spjspj/master 
Add argument.  Can go say:  gen_all_files_in_dck.pl basic to find jus…
 2017-07-07 21:43:53 +10:00
spjspj
e268acbdf8 Add argument. Can go say: gen_all_files_in_dck.pl basic to find just basics or gen_all_files_in_dck.pl basic | grep "HOU:" to find just HOU basics. 2017-07-07 21:42:49 +10:00
fireshoes
9284bbe6f3 Merge 2017-07-07 01:33:20 -05:00
fireshoes
160647c7cb [HOU] Added several cards 2017-07-07 01:11:27 -05:00
emerald000
e8c1def9b0 [HOU] Added Nimble Obstructionist. 2017-07-06 23:00:37 -04:00
fireshoes
8a4aa57f06 Unstash? 2017-07-06 21:54:13 -05:00
fireshoes
42810944f3 Commit merge 2017-07-06 21:29:21 -05:00
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