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

17598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric McVicker
80814b457c Merge pull request #2928 from JOAC69/master 
Remove trailing space on CardHelper.getType()
 2017-03-05 19:15:24 -06:00
JOAC69
9145f64afe Merge remote-tracking branch 'upstream' 2017-03-05 19:10:36 -06:00
JOAC69
c854fc3d1a Remove trailing space on CardHelper.getType() 2017-03-05 19:10:20 -06:00
ingmargoudt
8ceba843c6 Merge pull request #2926 from ingmargoudt/master 
cards now use the new CountType
 2017-03-05 23:42:45 +01:00
ingmargoudt
5387f06898 cards now use the new CountType 2017-03-05 23:29:51 +01:00
ingmargoudt
dd84287305 Merge pull request #2923 from ingmargoudt/master 
Replace checktype enum for Cardtype enum
 2017-03-05 20:05:21 +01:00
ingmargoudt
80580d69e9 Replace checktype enum for Cardtype enum 2017-03-05 20:04:09 +01:00
Derek M
59d0262943 Merge pull request #2922 from drmDev/ut/grand-arb 
unit tests for Grand Arbiter Augustin IV
 2017-03-05 12:18:11 -05:00
drmDev
2aa1ee2471 minor mod 2017-03-05 12:17:17 -05:00
drmDev
594e22a245 tests for GrandArbiter cost reduction and increase based on reported bug. unconfirmed 2017-03-05 12:16:12 -05:00
Derek M
fcfa70727f Merge pull request #2921 from drmDev/cardimpl/phy-purge 
Implemented card Phyrexian Purge
 2017-03-05 11:35:35 -05:00
drmDev
bf5e55aef9 modifications 2017-03-05 11:34:10 -05:00
drmDev
c8e41bc002 Phyrexian Purge impl and tests 2017-03-05 10:37:05 -05:00
Derek M
84983a6841 Merge pull request #2919 from drmDev/ut/nacatl2 
more unit tests for issue 2845 with Nacatl
 2017-03-05 07:57:33 -05:00
drmDev
4bfa956368 more tests for Nacatl must be blocked 2017-03-05 07:54:55 -05:00
spjspj
05806eabcd Merge pull request #2918 from spjspj/master 
Slight fix for mtg-cards-data
 2017-03-05 22:40:02 +11:00
spjspj
1ec9923f3d Slight fix for mtg-cards-data 2017-03-05 22:39:12 +11:00
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