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

18163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexsandro
6fb344a306 Create test class to validate error 2017-03-06 16:15:02 -03:00
Derek M
a02e366c2d Merge pull request #2936 from drmDev/ut/athreos 
#2832 test for Athreos not triggering on Cartel sac ability
 2017-03-06 14:13:36 -05:00
Derek Monturo
c53c0d2e9e #2832 test for Athreos not triggering on Cartel sac ability 2017-03-06 14:12:38 -05:00
spjspj
134d1b5872 Merge pull request #2934 from spjspj/master 
spjspj - Implement Land Equilibrium (LEG, ME3)
 2017-03-07 01:21:19 +11:00
spjspj
c34826611b spjspj - Implement Land Equilibrium (LEG, ME3) 2017-03-07 01:20:35 +11:00
spjspj
d63835359a Merge pull request #2933 from spjspj/master 
spjspj - Implement Land Equilibrium (LEG, ME3)
 2017-03-07 00:58:02 +11:00
spjspj
2e4d5e2bba spjspj - Implement Land Equilibrium (LEG, ME3) 2017-03-07 00:57:04 +11:00
spjspj
d822e98005 Merge pull request #2932 from spjspj/master 
spjspj - Implement Planar Void (USG)
 2017-03-06 23:59:30 +11:00
spjspj
fd57cf537c spjspj - Implement Planar Void (USG) 2017-03-06 23:56:02 +11:00
ingmargoudt
2cc1f2614d Merge pull request #2931 from ingmargoudt/master 
fixed a count in Battlefield, changed loops to streams
 2017-03-06 12:26:09 +01:00
ingmargoudt
90c6a69335 fixed a count in Battlefield, changed loops to streams 2017-03-06 12:25:14 +01:00
ingmargoudt
26fc9161d4 Merge pull request #2930 from ingmargoudt/master 
put comparing logic in counttype, remove all switches
 2017-03-06 11:48:05 +01:00
ingmargoudt
3d029d6ad5 put comparing logic in counttype, remove all switches 2017-03-06 11:46:22 +01:00
ingmargoudt
0adc715499 Merge pull request #2929 from ingmargoudt/master 
small change in gender enum
 2017-03-06 10:21:29 +01:00
ingmargoudt
6d4c388c5e small change in gender enum 2017-03-06 10:18:16 +01:00
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