Commit graph

1692 commits

Author SHA1 Message Date
Mark Langen
6912e45310 Merge branch 'master' of https://github.com/magefree/mage 2017-04-08 20:03:57 -06:00
Mark Langen
f96a1532bf Add Approach of the Second Sun [AKH] + test 2017-04-08 20:03:23 -06:00
drmDev
b7c903fc55 #3075 ut does not confirm bug with behind scenes 2017-04-08 13:16:35 -04:00
Mark Langen
40870f22c2 Added a bunch of spoiled cards for 4/5
* Added Colossapede
* Added Cut // Ribbons
* Added Insult // Injury (+test)
* Added Mouth // Feed
* Added Pouncing Cheetah
* Added Scarab Feast
* Added Rags // Riches (+test)
2017-04-05 22:41:56 -06:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -06:00
Mark Langen
7a6b8a1540 Final Aftermath implementation stuff
* Fixed PlayerImpl::getPlayable() to support aftermath (Needs PLAY_FROM_NOT_OWN_HAND_ZONE at the granularity of each card half rather than the whole card)
* Added tests for Dusk // Dawn to make sure there are no regressions on Aftermath.
2017-04-04 18:28:30 -06:00
ingmargoudt
ff6d1541c3 clientcallbacks to enums 2017-04-04 21:52:15 +02:00
Derek Monturo
eec4c07726 #3048 unit test for vexing devil redirect planeswalker interaction. unable to duplicate issue 2017-04-04 10:50:14 -04:00
LevelX2
45818f3a51 * Celestial Dawn - Fixed that it was not possible to pay colorless costs with non white mana. 2017-04-04 15:32:39 +02:00
Mark Langen
a96a7f89f5 Work in progress changes for Amonket Aftermath ability.
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
2017-04-03 04:15:25 -06:00
ingmargoudt
211d433ea9 playertype, enum singleton 2017-04-02 22:09:20 +02:00
Derek M
b19170f34f Merge pull request #3045 from SickBoyWi/master
Implemented Soul Burn card for the two sets it's a part of: Ice Age a…
2017-04-02 12:17:32 -04:00
LevelX2
097a8ce0dd Some rework to end turn logic and removing of stack objects (related to #2977). 2017-04-02 15:18:50 +02:00
LevelX2
15c1c7f8c0 * Fixed a problem with flashback ability and variable non mana costs (related to #2436). 2017-04-02 10:11:25 +02:00
ingmargoudt
594ffa2754 rewrote some streams and optionals 2017-04-01 22:45:40 +02:00
LevelX2
d0bf77cedf * Fixed a problem with replacement effects that add counters were applied more than once to the same EnteresTheBattlefield event (fixes #2872). 2017-04-01 17:43:17 +02:00
Johnny.Hastings@gmail.com
2be3f20320 Implemented Soul Burn card for the two sets it's a part of: Ice Age and Invasion. 2017-03-31 18:33:17 -05:00
LevelX2
94f77675ec * Reverted NykthosDevotion test commented out lines. 2017-04-01 00:53:47 +02:00
ingmargoudt
884ae83791 Merge pull request #3042 from ingmargoudt/card_functions
move static function to CardImpl, and other api fixes
2017-03-31 18:52:37 +02:00
Derek Monturo
1b9585ead7 #2872 added UT confirming bug for hangerback walker interaction 2017-03-31 11:00:08 -04:00
drmDev
f79ed5469d #3002 updated UT for firecat 2017-03-30 21:56:59 -04:00
ingmargoudt
6f8f10fcc3 move static function to CardImpl, and other api fixes 2017-03-30 20:09:47 +02:00
drmDev
cbf5f38d84 #3039 confirmed nykthos bug by UT 2017-03-29 19:57:17 -04:00
fireshoes
55b433ae36 [AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards. 2017-03-28 22:25:29 -05:00
Derek M
b68bfdf4c2 Merge pull request #3032 from ingmargoudt/type_api
Type api
2017-03-28 22:48:02 -04:00
Derek Monturo
31d238df5d #2984 UT confirming bug 2017-03-28 12:57:45 -04:00
Derek Monturo
3810f3ad2d #3002 UT confirming bug with firecat blitz 2017-03-28 11:08:57 -04:00
drmDev
c25361202a minor fixes - remove inconsistent test, make isperia ability non-optional 2017-03-27 23:36:06 -04:00
drmDev
29b03fb3ed Closes #3030 UT for child of alara unable to duplicate 2017-03-27 22:41:08 -04:00
ingmargoudt
0879298e92 refactor cards to use supertype enum 2017-03-27 21:56:33 +02:00
Achilles
ed37c5db8d - Removed a test case from ReturnToHandEffectsTest that was inconsistent with the game engine. I tested the scenario and it worked fine. 2017-03-26 16:56:02 -05:00
Derek M
1a9c5fa469 Merge pull request #3014 from drmDev/bug/sphereCosts
fixes #3012 manaCosts not null check and way to retrieve it
2017-03-24 08:06:30 -04:00
drmDev
be62b11d2f #3005 halimar tidecaller unit test. unable to duplicate issue. 2017-03-23 23:52:02 -04:00
drmDev
94c8d7f387 #3017 unit tests for declaration in stone. cannot duplicate issue 2017-03-23 23:38:03 -04:00
drmDev
097d60f5fc fixes #3012 manaCosts not null check and way to retrieve it 2017-03-23 10:25:21 -04:00
Derek M
cf831eea28 Merge pull request #3007 from kubikrubikvkube/master
Enums should be compared with == but not equals()
2017-03-22 16:17:07 -04:00
Derek M
9c3aab3284 Merge pull request #3009 from Alexsandr0x/Citadel-of-Pain
Citadel of Pain
2017-03-22 16:16:21 -04:00
Alexsandro
0d0bba7f57 Fiz turns to pass in unit test 2017-03-22 13:14:15 -03:00
Alexsandro
bfb2b07ba6 Create unit tests 2017-03-22 13:09:49 -03:00
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
vraskulin
f37c823aa8 String + string concatenation can be replaced by string + char concetenation 2017-03-20 14:00:18 +03:00
drmDev
fb37dcd5f1 #2995 unable to duplicate by unit tests 2017-03-19 22:09:29 -04:00
LevelX2
bc81f7974a Merge pull request #2992 from ingmargoudt/optionals
rewrites to optionals
2017-03-19 23:27:09 +01:00
drmDev
311e41abd2 refactored exiletokensAtEndStep 2017-03-19 17:54:07 -04:00
ingmargoudt
ff6c6405aa rewrites to optionals 2017-03-19 19:48:32 +01:00
drmDev
c109fc8a0e Implemented card Lightning Coils and test for it 2017-03-19 12:23:58 -04:00
drmDev
0d1c846cd5 #2989 cannot duplicate medomai issue with UT 2017-03-19 10:44:59 -04:00
drmDev
286eca3116 closes #2625 unable to duplicate with UT 2017-03-18 14:44:38 -04:00
drmDev
0e5ba16ac1 #2983 confirmed bug with skyfire kirin 2017-03-18 09:32:28 -04:00