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

18048 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derek M
c56975fa7e Merge pull request #3043 from drmDev/ut/firecat2 
#3002 updated UT for firecat
 2017-03-30 21:57:51 -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
Derek M
0791283a6b Merge pull request #3040 from drmDev/ut/nykthos 
#3039 confirmed nykthos bug by UT
 2017-03-29 19:58:10 -04:00
drmDev
cbf5f38d84 #3039 confirmed nykthos bug by UT 2017-03-29 19:57:17 -04:00
fireshoes
1bf2d1782c [MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates 2017-03-29 10:42:43 -05:00
fireshoes
212f963b43 Merge origin/master 2017-03-29 08:16:44 -05:00
Achilles
94dc4ac52c - Fixed Pathbreaker Ibex. Bug #2984 2017-03-28 22:34:19 -05: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
fireshoes
adc3b2ccac Fixed Chandra, Pyromaster only casting cards, not playing. Add Oracle's Vault to MLP 2017-03-28 22:16:14 -05:00
Derek M
b68bfdf4c2 Merge pull request #3032 from ingmargoudt/type_api 
Type api
 2017-03-28 22:48:02 -04:00
Derek M
fa453815ed Merge pull request #3037 from drmDev/ut/multani 
#2984 UT confirming bug
 2017-03-28 12:58:29 -04:00
Derek Monturo
31d238df5d #2984 UT confirming bug 2017-03-28 12:57:45 -04:00
Derek M
ff382cf0a6 Merge pull request #3036 from drmDev/bug/firecat-blitz 
#3002 UT confirming bug with firecat blitz
 2017-03-28 11:09:35 -04:00
Derek Monturo
3810f3ad2d #3002 UT confirming bug with firecat blitz 2017-03-28 11:08:57 -04:00
Derek M
21aaffc95c Merge pull request #3035 from drmDev/master 
minor fixes - remove inconsistent test, make isperia ability non-optional
 2017-03-27 23:37:00 -04:00
drmDev
c25361202a minor fixes - remove inconsistent test, make isperia ability non-optional 2017-03-27 23:36:06 -04:00
Achilles
f6279d1250 - Fix Isperia the Inscrutable. Bug #3018 2017-03-27 22:23:44 -05:00
Derek M
96522e152b Merge pull request #3034 from drmDev/master 
fix build - bonds of mortality using loseabilityalleffect
 2017-03-27 23:15:18 -04:00
drmDev
4bdf0f1c08 fix build - bonds of mortality using loseabilityalleffect 2017-03-27 23:14:29 -04:00
Derek M
4e8816ac88 Merge pull request #3033 from drmDev/ut/child-alara 
Closes #3030 UT for child of alara unable to duplicate
 2017-03-27 22:42:14 -04:00
drmDev
29b03fb3ed Closes #3030 UT for child of alara unable to duplicate 2017-03-27 22:41:08 -04:00
Derek M
1dcd3d0a81 Merge branch 'master' into type_api 2017-03-27 19:13:45 -04:00
Jeff
aa81a6d663 - LoseAbilityAllEffect() now works with rule 611.2c. 2017-03-27 17:17:56 -05:00
Jeff
c4dc0222d8 - Fixed Indomitable Creativity. Bug #3029 2017-03-27 16:42:32 -05:00
ingmargoudt
5cd1b5880f fix supertype on the client 2017-03-27 22:20:19 +02:00
ingmargoudt
0879298e92 refactor cards to use supertype enum 2017-03-27 21:56:33 +02:00
ingmargoudt
84559457d3 refactor supertype to enum 2017-03-27 21:51:04 +02:00
Clint Herron
70e4752cfd Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-27 08:37:27 -04:00
Achilles
3a2c828fb8 - Fixed Rivals' Duel. 2017-03-26 18:25:45 -05: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
3d1aa304df Merge pull request #3027 from drmDev/bug/gameofchaos 
fixes #3022 Bug/gameofchaos
 2017-03-26 11:56:39 -04:00
drmDev
dcc8dc68f9 Fixes #3022 : Game of Chaos refactor and fix 2017-03-26 11:55:18 -04:00
drmDev
523703b373 merge 2017-03-26 10:33:41 -04:00
Achilles
c2bcb59c82 - Added Barrin's Spite. Fixed a targeting issue. 2017-03-25 22:41:03 -05:00
Clint Herron
402beb3b49 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-25 22:07:23 -04:00
Achilles
f7eab224dd - Missed Genju of the Cedars in that last commit. 2017-03-25 18:41:25 -05:00
Achilles
26dbee6f2d - Added BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(). Converted all the Genju cards to use it. This class is subject to rule 611.2c. 2017-03-25 17:30:14 -05:00
Achilles
0639b3b75b - Reverted BecomesCreatureAttachedEffect(). It broke cards that are not subject to Rule 611.2c like Ensoul Artifact. A new class called BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect() will be made to fix the Genju of the Spires bug. Yes, that is a long name. If someone has a better suggestion, please let it be known. 2017-03-25 17:02:47 -05:00
Achilles
908861e56a - Fixed Maralen of the Mornsong. 2017-03-25 14:07:14 -05:00
Achilles
ff489446fe - Fixed BecomesCreatureAttachedEffect(). Rule 611.2c. Fixes https://github.com/magefree/mage/issues/3011 2017-03-25 13:11:08 -05:00
Clint Herron
40d318ce09 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-25 10:46:20 -04:00
ingmargoudt
8da4f72f8d Merge pull request #3023 from ingmargoudt/inspecting_npe 
Inspecting npe
 2017-03-25 09:45:52 +01:00
ingmargoudt
95869811ac fixed scope issue when logging in 2017-03-25 09:38:08 +01:00
ingmargoudt
372fb4ec91 Merge branch 'master' of https://github.com/magefree/mage 2017-03-25 09:03:39 +01:00
Achilles
302f1f8262 - Fixed Goblin Grenade 2017-03-24 21:18:06 -05:00
Achilles
9702074bf5 - Fixed the Dissention set. Accidently add War's Toll. 2017-03-24 18:54:28 -05:00
Achilles
e30821b6cf - Added Azorius AEthermage. Fixed Spellshift: The library must be shuffled. 2017-03-24 18:30:57 -05:00
Achilles
b4a60555fc Revert "Change for id str" 
This reverts commit 1e8216c5c5.
 2017-03-24 17:06:33 -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