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

17681 commits

This branch
This branch
All branches
Author SHA1 Message Date
drmDev
861cc222ec Merge remote-tracking branch 'upstream/master' 2017-03-05 06:35:01 -05:00
spjspj
f8209c646a Merge pull request #2917 from spjspj/master 
Slight fix for mtg-cards-data
 2017-03-05 22:26:24 +11:00
spjspj
4b1bbd20b7 Slight fix for mtg-cards-data 2017-03-05 22:25:28 +11:00
ingmargoudt
d31e3a3f8f Merge pull request #2916 from ingmargoudt/master 
remove all contains(cardtype.XX) references, instead use the default …
 2017-03-05 09:16:28 +01:00
ingmargoudt
b5e8c88153 remove all contains(cardtype.XX) references, instead use the default interface method 2017-03-05 09:14:33 +01:00
ingmargoudt
ef797384e6 Merge pull request #2914 from kubikrubikvkube/master 
Should it be mandatory?
 2017-03-05 09:04:37 +01:00
Nathaniel Brandes
733de2d27f Remove generated folder. 2017-03-04 23:31:55 -08:00
Nathaniel Brandes
a2f110d2c4 Untracked some generated files. 2017-03-04 23:27:28 -08:00
Nathaniel Brandes
58d0a8eb2a Remove empty function incorrectly checked in. 2017-03-04 23:08:54 -08:00
Nathaniel Brandes
1d3ebb749d Fix omniscience effect for colorless mana. 
Also unified the tests for omniscience into a single file, and
put the effect into a single class so that Tamiyo and Omniscience
can share implementations.
 2017-03-04 23:04:11 -08:00
drmDev
b3a235392f Merge remote-tracking branch 'upstream/master' 2017-03-04 19:23:24 -05:00
Derek M
be82f3bf33 Merge pull request #2915 from drmDev/ut/nacatl 
added test for Nacatl War-Pride
 2017-03-04 19:22:46 -05:00
Justin Herlehy
a97edcf8f9 Merge remote-tracking branch 'origin/master' 2017-03-04 16:21:03 -08:00
Justin Herlehy
8cfe66e29c Fix Ichorid to set notTarget flag. 
Fixes issued #2906
 2017-03-04 16:20:17 -08:00
drmDev
318e89a8bc updated gitignore to ignore another plugins/target 2017-03-04 19:04:51 -05:00
drmDev
6d20c7a996 added test for Nacatl War-Pride 2017-03-04 18:54:29 -05:00
Justin Herlehy
e66526ed75 Merge pull request #2913 from KyleCartmell/master 
Looks good, thank you for your contribution.
 2017-03-04 15:54:04 -08:00
doncarton
7fd068bd74 Should it be mandatory? 2017-03-05 01:39:20 +03:00
Kyle W. Cartmell
1a4d9aeb97 implemented Wall of Opposition 2017-03-04 14:47:40 -07:00
Achilles
ca0371eade - Fixed Island of Wak Wak. 2017-03-04 10:29:18 -06:00
ingmargoudt
545b21881b Merge pull request #2911 from ingmargoudt/master 
added new helper methods to test for CardType, to get rid of the cont…
 2017-03-04 00:17:50 +01:00
ingmargoudt
5a57731968 added new helper methods to test for CardType, to get rid of the contains(CardType.XXX) everywhere, put the logic of that in one place and use the interface call 2017-03-04 00:16:36 +01:00
ingmargoudt
a4f64c74c9 Merge pull request #2910 from ingmargoudt/master 
changed cardtype from list to enumset
 2017-03-03 23:01:56 +01:00
ingmargoudt
6b20d352ca added unit test 2017-03-03 22:28:34 +01:00
ingmargoudt
a0930e3379 missed 2 hashsets to enumsets 2017-03-03 22:14:00 +01:00
fireshoes
0aa1296b31 Added complete MM3 spoiler. 2017-03-03 12:20:59 -06:00
Jeff
ecbadeda41 - Fixed Stone Haven Outfitter 2017-03-03 11:35:52 -06:00
ingmargoudt
372584f7ad changed cardtype from list to enumset 2017-03-03 17:04:32 +01:00
Jeff
c0ffc47bf7 - Fixed Grasp of Fate. It will now return exiled permanents if it leaves the battlefield. 2017-03-03 09:55:06 -06:00
fireshoes
010be2b53f Added 3/2/17 MM3 reprints. 2017-03-02 21:39:14 -06:00
Achilles
9cf0ebb2ae - Shining Shoal will now work with spells. Yes, more work on this needs to be done. If a chosen source deals damage to multiple targets, the controller should be able to choose how that damage is distributed. 2017-03-02 20:35:12 -06:00
fireshoes
97ccd22564 Added 3/2/17 MM3 reprints. 2017-03-02 12:11:25 -06:00
ingmargoudt
cdeb27ea06 Merge pull request #2908 from ingmargoudt/master 
wrongly changed the equals to == for those files
 2017-03-02 16:42:29 +01:00
ingmargoudt
9c71596fd8 wrongly changed the equals to == for those files 2017-03-02 16:41:38 +01:00
ingmargoudt
87b492d4d4 Merge pull request #2907 from ingmargoudt/master 
change enum equals to == in cards
 2017-03-02 16:37:10 +01:00
ingmargoudt
39c9420ad2 change enum equals to == in cards 2017-03-02 16:28:23 +01:00
LevelX2
5087534fe4 Merge pull request #2892 from Galatolol/master 
Added 3 cards
 2017-03-02 11:05:34 +01:00
ingmargoudt
f3c565e582 Merge pull request #2905 from kubikrubikvkube/master 2017-03-02 08:54:38 +01:00
vraskulin
620245f28f Stream format 2017-03-02 10:51:02 +03:00
spjspj
1aecd4f235 Merge pull request #2904 from spjspj/master 
Force an enter to exit gen-existing-cards-by-set.pl
 2017-03-02 08:50:08 +11:00
spjspj
4c54fea0c7 Force an enter to exit gen-existing-cards-by-set.pl 2017-03-02 08:49:01 +11:00
fireshoes
dc0905c893 Added 3/1/17 MM3 reprints. 2017-03-01 11:49:41 -06:00
ingmargoudt
5be5feaaa7 Merge pull request #2903 from ingmargoudt/master 
fix #1259
 2017-03-01 18:04:30 +01:00
ingmargoudt
fb09aeb0a8 fix #1259 2017-03-01 17:56:47 +01:00
ingmargoudt
fca138f821 Merge pull request #2902 from ingmargoudt/master 
change enum equals to == for client
 2017-03-01 17:04:12 +01:00
ingmargoudt
d966c82019 change enum equals to == for client 2017-03-01 17:03:11 +01:00
ingmargoudt
a32a02b688 Merge pull request #2901 from ingmargoudt/master 
change enum equals to ==
 2017-03-01 15:38:42 +01:00
ingmargoudt
d01aed42ed change enum equals to == 2017-03-01 15:05:44 +01:00
spjspj
82841c16c6 Merge pull request #2900 from spjspj/master 
Refactor color restriction in edh...
 2017-03-01 09:12:23 +11:00
spjspj
4681232d18 Refactor color restriction in edh... 2017-03-01 09:11:29 +11:00