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

29725 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Agafonov
04f78500eb
Merge pull request #6082 from phulin/adventures 
Implement adventures.
 2019-12-12 04:54:50 +01:00
Patrick Hulin
555a177dd2 Ignore failing Bolas's Citadel test for now. 2019-12-11 22:49:50 -05:00
Patrick Hulin
27bb6fa432 Conform AdventureCard to new getAbilities plan. 2019-12-11 22:42:32 -05:00
Patrick Hulin
383069f5eb Merge branch 'master' of https://github.com/magefree/mage into adventures 2019-12-11 22:15:38 -05:00
Patrick Hulin
f63561cfb7 Add canActivate flag. 2019-12-11 22:15:07 -05:00
Evan Kranzler
a2c142df41 fixed the amount of tokens made by Elspeth, Sun's Nemesis 2019-12-11 20:50:23 -05:00
Evan Kranzler
3965061234 Implemented Elspeth, Sun's Nemesis 2019-12-11 20:08:07 -05:00
Evan Kranzler
23324f2169 Added Theros: Beyond Death 2019-12-11 19:39:51 -05:00
Oleg Agafonov
be7dea2d16 * UI: fixed that split cards doesn't marks as playable; 2019-12-11 04:44:25 +04:00
Oleg Agafonov
c6dd9a2621 * Master Splicer - fixed text; 2019-12-11 04:40:52 +04:00
Oleg Agafonov
6b5a9846b9 Fixed rules generation 2019-12-11 04:40:07 +04:00
Patrick Hulin
b0bac1f751 Fix Bolas's Citadel and add test. 2019-12-10 18:01:32 -05:00
jeffwadsworth
dd68a1ba84 - Fixed #6084 2019-12-10 16:51:35 -06:00
Patrick Hulin
b17bf1ac9f Save and restore controller ID in cardPlayableAbilities. 2019-12-10 16:35:53 -05:00
Patrick Hulin
fbc88f152e Fix Teferi, Time Raveler behavior and ignore W6 emblem failure for now. 2019-12-10 14:24:35 -05:00
Patrick Hulin
d3ee51c155 Add tests for W6 and flash effects like Teferi, Time Raveler. 2019-12-10 13:48:15 -05:00
Patrick Hulin
2f138a04ae Fix issue with casting opponents' cards. 2019-12-10 13:33:27 -05:00
Patrick Hulin
cd890d329a Fix behavior for Garruk's Horde, Melek, W6. 2019-12-10 11:34:19 -05:00
jeffwadsworth
ca22a7750a - Fixed #5925 and related issues. 2019-12-10 10:25:07 -06:00
Patrick Hulin
19ca9f555c Remove duplicated ability text. 2019-12-10 00:17:22 -05:00
Patrick Hulin
317a81678f Remove cast ability when adventure is a permanent. 
This prevents the adventure ability text from displaying when the card is on the battlefield.
 2019-12-10 00:10:34 -05:00
Patrick Hulin
abcd0512a5 Unused import. 2019-12-09 21:35:43 -05:00
Patrick Hulin
d2cb10d7b7 Clean up visual details. 2019-12-09 21:12:21 -05:00
Patrick Hulin
1bbfc32886 Add test for multiple adventures. 2019-12-09 19:57:54 -05:00
Patrick Hulin
a2a569195a Fix issue where you could cast Adventure from exile. 2019-12-09 19:38:41 -05:00
James Fitzpatrick
b2e4e950d0 6079 - Fixing conditional damage order, conditions (#6080) 
* 6079 - Fixing conditional damage order, conditions

As of c482fad, a number of spells had their conditional damage
reworded in oracle text. As a part of these changes, some of the
spells had their order of effects inverted, with the damage
after the condition was happening before the condition was met.
In addition, Brimstone volley was changed from a Morbid condition
to a Hellbent condition. This commit corrects those typos.

* Update Mage.Sets/src/mage/cards/f/FirecannonBlast.java

Co-Authored-By: Fenhl <fenhl@fenhl.net>
 2019-12-09 14:26:57 -06:00
Patrick Hulin
5af4942d15 Add test for copying and more test comments. 2019-12-09 14:16:38 -05:00
Patrick Hulin
af5ccf6914 Implement AdventurePredicate. 
This adds support for Edgewall Innkeeper (and similar cards) and Memory Theft.
 2019-12-09 13:50:07 -05:00
Patrick Hulin
6160bc25ef Remove unused file. 2019-12-09 12:48:05 -05:00
Patrick Hulin
19a9d98287 Adventures basically working. 
No graphics yet.
 2019-12-09 12:46:43 -05:00
jeffwadsworth
99c50d041a - Fixed #6079 2019-12-09 10:45:50 -06:00
Patrick Hulin
04a4b91a59 Begin implementing adventures. 2019-12-09 11:30:11 -05:00
Oleg Agafonov
b0c01da007
Merge pull request #6077 from Tosh94/fix-plasm-capture-double-mana 
Fix Plasm Capture giving double mana in the next pre-combat main phase
 2019-12-08 17:16:27 +01:00
Oleg Agafonov
fa62dac244
Merge pull request #6078 from Tosh94/fix-nicol-bolas-god-pharaoh-+1 
Fix NPE when using Nicol Bolas, God-Pharaoh's +1
 2019-12-08 17:12:54 +01:00
Tosh94
1365e7ff6c Fix NPE when using Nicol Bolas, God-Pharaoh's +1 when an opponent has no cards in hand. 2019-12-08 17:03:47 +01:00
Tosh94
01ad151934 Fix Plasm Capture giving double mana in the next pre-combat main phase. 
Additionally, remove special PlasmCaptureManaEffect in favor of the generic AddManaInAnyCombinationEffect, improving mana selection.
 2019-12-08 16:48:23 +01:00
Oleg Agafonov
9748136723 Fixed dates 2019-12-07 21:55:45 +04:00
Oleg Agafonov
240c5834af Prepare new release 2019-12-07 20:57:11 +04:00
Sarah Souders
d6880e716c
Merge pull request #5 from magefree/master 
merge
 2019-12-07 11:09:56 -05:00
Oleg Agafonov
d35e96cc47
Merge pull request #6071 from Dh0mp5eur/master 
updated DuelCommander ban list
 2019-12-07 01:09:18 +01:00
Oleg Agafonov
899cde4d54
Merge pull request #6073 from ssouders412/pronoun-fixes 
Updated pronouns to reflect current rules and oracle text
 2019-12-07 01:07:11 +01:00
Oleg Agafonov
1d20069ddf * Fixed wrong selection count in choose ability mode dialog (cards like Planewide Celebration); 2019-12-07 01:48:39 +04:00
ssouders412
50bd6cbc32
More pronoun fixes 2019-12-06 15:17:44 -05:00
jeffwadsworth
57cb023f78 - Fixed an issue with AffinityEffect and multiplayer games. See #5931 2019-12-06 14:16:32 -06:00
ssouders412
2d3247d732
Updated pronouns to reflect current rules and oracle text 
Replaced all instances of "her or she", "him or her", and "his or her", with "they", "them", and "their", or sometimes "that player". Updated verbs where appropriate.
 2019-12-06 14:29:36 -05:00
jeffwadsworth
30e8fec8df - Fixed #5931 2019-12-06 11:43:12 -06:00
Oleg Agafonov
bf5e603fcb Merge fix 2019-12-06 21:08:20 +04:00
Oleg Agafonov
a8d707b469 Additional watchers fixes for #6065, see comments in f21151bca5 2019-12-06 21:02:41 +04:00
Sarah Souders
45cccc75c4
Merge pull request #4 from magefree/master 
merge
 2019-12-06 11:32:07 -05:00
jeffwadsworth
97f066a31a - Fixed #5948 2019-12-05 18:27:51 -06:00