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
31662 commits 2 branches 0 tags 782 MiB
Commit graph

31662 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Agafonov
5ec6e65c72
Merge pull request #6435 from ciaccona007/master 
Give Nesting Grounds "another" condition
 2020-04-18 23:34:46 +02:00
Evan Kranzler
7b68d855a4 Implemented Decoy Gambit 2020-04-18 17:33:07 -04:00
Oleg Agafonov
4b940fb2fe
Merge pull request #6432 from htrajan/c20-sanctuary-blade-and-verge-rangers 
C20 sanctuary blade and verge rangers
 2020-04-18 23:31:10 +02:00
htrajan
9366222761 combine into one ability and show correct rules text 2020-04-18 14:18:19 -07:00
ciaccona007
27a351e92b Nesting Grounds can't target the same permanent twice 2020-04-18 14:11:02 -07:00
ciaccona007
3d3d9b6a97 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/cards/n/NestingGrounds.java
 2020-04-18 14:00:55 -07:00
Oleg Agafonov
b251d97cdb * Leech Bonder - fixed that it removes all counter instances instead one; 2020-04-19 00:48:30 +04:00
Oleg Agafonov
58ebf01c3b Added fixed version of Nesting Grounds (see #6433); 2020-04-19 00:46:02 +04:00
ciaccona007
9776faa1df Nesting Grounds can't target the same permanent twice 2020-04-18 13:35:25 -07:00
Evan Kranzler
c2137b934b
Revert "Implement Nesting Grounds (#6433)" (#6434) 
This reverts commit c3892536b6.
 2020-04-18 16:30:48 -04:00
htrajan
4ab979458a remove flaky test (passing locally but failing in maven test) 2020-04-18 13:26:10 -07:00
htrajan
874ff7179f -don't static import static filters 
-use existing choose color and gain protection from color attached effects
-update naming and add null check for AttachedToCreatureSourceTriggeredAbility
 2020-04-18 13:13:02 -07:00
ciaccona007
c3892536b6
Implement Nesting Grounds (#6433) 2020-04-18 16:07:57 -04:00
Oleg Agafonov
0dd4e821b9 Fixed missing MTGA Cube 2020 April in configs (related to #6396); 2020-04-19 00:00:07 +04:00
ciaccona007
2ff41028a9 Implement Nesting Grounds 2020-04-18 12:55:19 -07:00
Oleg Agafonov
80ffa1652f * Can't attack or block until pay abilities - fixed missing card texts (Floodtide Serpent, Qal Sisma Behemoth); 2020-04-18 22:11:32 +04:00
Oleg Agafonov
2fbf1589a1 Merge remote-tracking branch 'origin/master' 2020-04-18 22:02:24 +04:00
Oleg Agafonov
bdd0ada5d5 * Seize the Soul - fixed that it can target any creatures instead nonwhite, nonblack; 2020-04-18 22:01:59 +04:00
Evan Kranzler
e37438caf6 Implemented Agitator Ant 2020-04-18 13:11:27 -04:00
Evan Kranzler
eaf412590a Implemented Lavabrink Floodgates 2020-04-18 12:44:23 -04:00
Oleg Agafonov
fa75a89946 Fixed tests 2020-04-18 17:10:15 +04:00
htrajan
c567fc2ee1 update author tags, remove unneeded static text 2020-04-17 22:30:39 -07:00
htrajan
9b930ca243 Merge branch 'master' into c20-sanctuary-blade-and-verge-rangers 2020-04-17 21:53:08 -07:00
htrajan
2cfe111880 Merge remote-tracking branch 'upstream/master' 2020-04-17 21:52:51 -07:00
htrajan
e09a922e31 wip 2020-04-17 21:51:21 -07:00
Evan Kranzler
c1249b9a5c Implemented Mindleecher 2020-04-17 23:16:39 -04:00
htrajan
5c93480f23 Merge remote-tracking branch 'upstream/master' 2020-04-16 21:14:14 -07:00
htrajan
827843a77b
Merge pull request #1 from htrajan/implement-zilortha 
Implement zilortha
 2020-04-16 21:08:03 -07:00
Oleg Agafonov
d7879e6b80
Merge pull request #6427 from htrajan/implement-zilortha 
Implement Zilortha
 2020-04-17 05:47:28 +02:00
htrajan
51dcaa1725 update simulators 2020-04-16 20:14:43 -07:00
Evan Kranzler
472b8c8519 Implemented Ukkima, Stalking Shadow 2020-04-16 23:09:12 -04:00
Evan Kranzler
914a358a40 Implemented Surly Badgersaur 2020-04-16 23:02:55 -04:00
Evan Kranzler
41df7d3209 Implemented Species Specialist 2020-04-16 22:56:00 -04:00
htrajan
5a1b40a42f add filter copy to GameState's copy constructor and restore method 2020-04-16 19:54:07 -07:00
Evan Kranzler
c6f0bfcffb Implemented Spellpyre Phoenix 2020-04-16 22:41:27 -04:00
htrajan
1dc305f329 -setStrictChooseMode and assertAllCommandsUsed in every test 
-store filter info in GameState
-put instead of putIfAbsent
 2020-04-16 19:21:54 -07:00
htrajan
7c4d86f583 add author tag 2020-04-16 18:11:56 -07:00
htrajan
5eeffc1fcf unstar import 2020-04-16 17:59:17 -07:00
htrajan
ddb14d8d56 unused imports 2020-04-16 17:55:24 -07:00
htrajan
92d6326316 finish 2020-04-16 17:50:17 -07:00
htrajan
a08bd34582 Merge branch 'master' into implement-zilortha 
# Conflicts:
#	Mage/src/main/java/mage/game/GameImpl.java
 2020-04-16 15:55:24 -07:00
htrajan
cab436e9e5 wip 2020-04-16 15:53:51 -07:00
Evan Kranzler
8e8b2567b3 fixed Jegantha, the Wellspring Companion Condition 2020-04-16 18:41:13 -04:00
Evan Kranzler
97b741f69f Implemented Ravenous Gigantotherium 2020-04-16 18:33:49 -04:00
Evan Kranzler
b5de12f83f updated C20 and IKO spoiler and reprints 2020-04-16 14:01:17 -04:00
Evan Kranzler
d34905ff14 Implemented Vitality Hunter 2020-04-16 13:59:51 -04:00
Evan Kranzler
7445dcb1cf Implemented Kelsien, the Plague 2020-04-16 09:01:18 -04:00
Evan Kranzler
916ff26070 Update UnpredictableCycloneTest.java 2020-04-16 08:15:52 -04:00
Evan Kranzler
d26b00ab17 updated companion conditions 2020-04-16 08:14:15 -04:00
Evan Kranzler
8494e98693
Implemented Yorion, Sky Nomad (#6407) 
* Implemented Yorion, Sky Nomad

* Implemented Yorion, Sky Nomad (but for real this time)

* updated game creation to use the correct deck size for limited
 2020-04-16 08:10:18 -04:00