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

1502 commits

Author SHA1 Message Date
LevelX2
7ec9394a83 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
 2017-01-06 21:57:18 +01:00
ludwig.hirth
aa375c687c * Uba Mask - Fixed some problems. 2017-01-03 17:18:34 +01:00
emerald000
60bad2407b Fighting Git, part 2. 2017-01-03 01:23:56 -05:00
ludwig.hirth
6c72794859 * Added test. 2016-12-29 17:05:32 +01:00
LevelX2
3a33fa4748 * Added Test for #2721. 2016-12-28 12:01:03 +01:00
LevelX2
ecc18072cf Cyclopean Tomb - Update. 2016-12-28 02:02:57 +01:00
LevelX2
f56c64af2d * Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems. 2016-12-27 16:01:09 +01:00
LevelX2
c05941cf0d * Added cascade test. 2016-12-24 10:16:03 +01:00
ludwig.hirth
ec4e50ece4 Added test. 2016-12-23 15:04:09 +01:00
ludwig.hirth
e5a5911c6e * Sacred Ground - Fixed that the Sacred Ground effect did also move the land if it was removed from graveyard since the ability triggered. 2016-12-23 12:29:33 +01:00
LevelX2
1de210ab74 * Fixed a bug of DealsDamageToOneOrMoreCreaturesTriggeredAbility, added some tests. 2016-12-18 17:50:33 +01:00
LevelX2
d85b9943f1 * Added logic to remove control effects that refer to permanents of a player that leaves the game. 2016-12-18 16:57:34 +01:00
LevelX2
da9e9a1180 * Fixed some possible null pointer exceptions and some minor editing. 2016-12-18 15:02:19 +01:00
LevelX2
61dd62b148 * Undiscovered Paradise - Fixed that it was not returned to hand on untap step (fixes #2693). 2016-12-17 09:27:24 +01:00
LevelX2
8d6d8d25e5 * Reflecting Pool - Fixed that mana from dynamic mana abilities were not taken into account (e.g. Gaea's Cradle or Serra's Sanctum). 2016-12-16 18:38:40 +01:00
LevelX2
79c80fe24b Added a test and some minor changes. 2016-12-11 23:10:20 +01:00
LevelX2
4b4aef8ed5 * Orzhov Advokist - Fixed that the attack preventing effect did not work correctly. 2016-12-11 16:25:08 +01:00
LevelX2
3d9b51bec3 * Animate Artifact - Fixed some problems. 2016-12-11 15:58:57 +01:00
LevelX2
fb2d3f911e * Power Surge - Fixed some problems. 2016-12-11 15:14:09 +01:00
LevelX2
561f120ce0 * Consecrete Land - Some changes. 2016-12-11 12:38:25 +01:00
LevelX2
8bf299e342 * Fixed and extended extra turn test. 2016-11-26 13:46:10 +01:00
Ryan Skeldon
949eb1acb0 Implemented Cairn Wanderer 2016-11-26 02:00:30 -05:00
Dilnu
3198558dd6 Fix March of the Machines 
Add a DependencyType for ArtifactAddingRemoving and use it to make March of the Machines come after artifact type adding effects.
 2016-11-22 08:40:54 -05:00
LevelX2
7daa476542 * Fixed that the color of cards cast face dwon and later turned face up was not set. 2016-11-20 22:34:12 +01:00
LevelX2
e6afdf0874 * Obscuring Aether - Fixed a problem that face down creatures had P/T = 0/0. 2016-11-20 10:15:11 +01:00
LevelX2
d3e6ae6bcd * Fixed test. 2016-11-20 10:12:21 +01:00
LevelX2
7d60d884c3 * Refelecting Pool - Fixed that mana that Exotic Orchard could produce was not taken into account. 2016-11-20 01:15:45 +01:00
LevelX2
4018d39dab Added test. 2016-11-20 00:45:18 +01:00
LevelX2
b7b7a97945 * Fixed that died creature were wrongly returned to battlefield also if it was moved to exile by replacement effect before. 2016-11-19 18:44:11 +01:00
LevelX2
bc61f66af1 * Merieke Ri Berit - Fixed a bug that controlled creatures after lost of control of Merieke were not destroyed. 2016-11-19 13:33:49 +01:00
LevelX2
0ccaca4a3b Fixed a problem that tokens that came into play with modified attributes (P/T e.g. from Master of Etherium) were seen for triggered abilities (e.g. Sword of the Meek ) with unmodified attributes. 2016-11-19 12:08:38 +01:00
LevelX2
cd61bf48d1 Added a test. 2016-11-13 22:29:26 +01:00
LevelX2
92a04be280 * Warp World - Fixed a bug caused by removing cards from library. 2016-11-12 17:32:57 +01:00
LevelX2
44f7b1b13c * Selvala, Explorer Returned - Fixed that the life gaining effect did not work. 2016-11-12 09:37:41 +01:00
LevelX2
c84d7ef49b Rite of the Raging Storm - Fixed bug that tokens were not doubled if the token was created by an effect controlled from other players (fixes #2584). 2016-11-12 09:00:09 +01:00
LevelX2
7cd105b951 Rite of the Raging Storm - Fixed some minor bugs (fixes #2584). 2016-11-12 08:45:43 +01:00
LevelX2
0db7a0427d * Bloodchief Ascension - Added test for triggered ability. All works as expected. (closes #2566). 2016-11-06 22:36:37 +01:00
Neil Gentleman
813c8cdd8a CreateTokenEffect already adds the article 
don't want to end up with "a a 3/3 colorless Golem"

and also fixed fix tapped token rules text, which has changed
 2016-11-05 11:27:36 -07:00
LevelX2
a4e1c7aefd Merge origin/master 2016-11-03 22:38:14 +01:00
LevelX2
d2561c1752 * Fixed a problem with triggered mana abilities. Fixed a problem that AI did not always select the needed mana color. Fixed a problem with Reflecting Pool not taking triggered mana abilities into account. 2016-11-03 22:37:54 +01:00
Neil Gentleman
ffa94811f6 fix compilation 
broken in c38f96ae55
 2016-11-01 21:28:42 -07:00
LevelX2
de28ea797e Merge pull request #2533 from magefree/issue-2492-emrakul-extra-turn 
* Emrakul, the Promised End - Fix that extra turn is not giving when …
 2016-10-31 07:36:11 +01:00
Quercitron
0dcc2a85b8 * Emrakul, the Promised End - Fix that extra turn is not giving when Emrakul is cast during an opponent's turn (fixes #2492). 2016-10-31 03:01:02 +03:00
Quercitron
75432f5b61 Revert rollback changes, fix rollback when extra turn was taken during an opponent's turn. 2016-10-31 02:51:40 +03:00
Quercitron
43581cafa3 Add assertActivePlayer test method. 2016-10-31 02:17:24 +03:00
LevelX2
1e07e52774 * Jace's Mindseeker - Fixed that no instant or sorcery could be cast from graveyard. 2016-10-30 00:27:52 +02:00
LevelX2
70126988c5 Changed rule text from "put token onto the battlefield" to "create token". 2016-10-29 23:42:19 +02:00
LevelX2
c7744d8631 * Fixed a bug with tokens using the optional EntersBattlefieldEffect (e.g. Clone with Mimic Vat). 2016-10-23 00:36:36 +02:00
LevelX2
bf43ea9936 Added test and fixed some possible null pointer exception. 2016-10-22 12:45:50 +02:00
LevelX2
97b872d926 * Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes). 2016-10-22 10:38:10 +02:00
LevelX2
ee96531de5 * Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes). 2016-10-21 00:15:41 +02:00
fireshoes
89dd981075 Merge 2016-10-17 23:45:47 -05:00
LevelX2
984d94e64d Added test. 2016-10-07 14:49:27 +02:00
JOAC69
e8230946af Remove use of card classes for duplicate cards. Remove set related information from being tied to card classes. 2016-10-04 19:58:48 -05:00
LevelX2
1a8f38759b Fixed a problem with filetring of CantBeTargetedAllEffect. 2016-10-03 19:43:26 +02:00
LevelX2
24fc597fe5 Fixed mode handling for modes that can be selected multiple times. 2016-10-03 19:41:46 +02:00
LevelX2
5469facdd6 Added a test. 2016-10-02 16:15:04 +02:00
LevelX2
3516dc75e4 Updated POM to use Java 8. Updated some tool versions in the POMs. 2016-09-29 16:21:32 +02:00
LevelX2
1066472491 * Fixed a bug that modal spells did not work correctly (fixes #2397). 2016-09-28 23:31:52 +02:00
LevelX2
86648c7190 * Reworked some parts of transform handling. Fixes #2396. 2016-09-28 17:02:37 +02:00
LevelX2
9cf9d69c55 Fixed minor problem of Volrath's Laboratory. Added combat flag to LIFE_LOST event. 2016-09-28 08:00:32 +02:00
spjspj
74503a1493 spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:48:41 +10:00
LevelX2
423c2bbf6c Fixed a problem of Flashback and Buyback producing a loop. 2016-09-24 03:13:59 +02:00
LevelX2
d5d00451a8 Fixed a problem with static abilities for battlefield zone where the source was entering the battlefield but the ability did not work. 2016-09-24 01:13:13 +02:00
LevelX2
c9bb0be016 Reworked selected modes handling. That fixed the Subtle Strike targeting problem. 2016-09-24 01:12:01 +02:00
LevelX2
5d50179c84 Added Test. 2016-09-23 15:12:21 +02:00
LevelX2
6b431be2ba * Shaman of the Great Hunt - Fixed that it triggerd also for other players. 2016-09-21 20:16:27 +02:00
emerald000
ab352100f1 Fixed Panharmonicon triggering for non-permanents. 2016-09-20 09:34:36 -04:00
emerald000
120d7612f6 Fixed Panharmonicon triggering for opponents abilities. Added tests. 2016-09-19 09:22:21 -04:00
Dilnu
2cab391d74 Fix a typo that broke the Snapcaster Blaze Test 2016-09-18 20:17:18 -04:00
Dilnu
87a6d3a1ee Fix the combat code to support Slayer's Cleaver 
Update the checks for unfulfilled conditions to confirm the blocking
creatures actually are fulfilled.
Update the check for whether a blocker is already being used correctly
to confirm that there isn’t a stricter condition that is unfulfilled.

This change also updates the Slayer’s Cleaver test to make it more
robust.
 2016-09-18 16:28:01 -04:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
0a5a073637 * Flashback - Fixed handling of combined flashback costs (e.g. Deep Analysis). 2016-09-15 17:34:25 +02:00
LevelX2
9f199dfa39 * ZonesHandler - fixed possible null pointer exception (#2271). Cause still unclear. 2016-09-14 23:25:36 +02:00
LevelX2
14b2760e99 * Fixed a bug that prevented moving tokens to other zones in some cases. 2016-09-14 20:51:03 +02:00
LevelX2
3612332607 [KLD] Added Speedway Fanatic. Added tests for crew keyword. 2016-09-14 15:16:40 +02:00
Samuel Sandeen
3ac80b45f3 Merge branch 'magefree/master' 2016-09-10 17:47:40 -04:00
Samuel Sandeen
4fc3418de4 Implement Skullbriar, the Walking Grave 
Skullbriar is implemented by a combination of a replacement effect that
serves as a marker and an override of the update zone change counter
function that copies counters from one zone to the next.
 2016-09-10 17:47:29 -04:00
LevelX2
80d1d94e71 * Added test for Runflare Trap. 2016-09-09 15:07:58 +02:00
Samuel Sandeen
ac6a289275 Merge branch 'magefree/master' 2016-09-08 19:12:19 -04:00
emerald000
0af7871804 TestPlayer should not scry down cards at the start of the game. 2016-09-08 09:09:32 -04:00
Samuel Sandeen
8f0258bc07 Fix two typos 2016-09-08 07:26:28 -04:00
Samuel Sandeen
80da09471d Merge remote-tracking branch 'magefree/master' 2016-09-07 23:31:38 -04:00
Samuel Sandeen
c33a731a4a Refactor the core zone change code to use a common code path. 2016-09-07 23:31:26 -04:00
emerald000
bc0f53973d Added an easier way to put custom text on buttons in a chooseUse prompt. 2016-09-06 02:07:59 -04:00
Samuel Sandeen
34846170c4 Remove an unused argument to Player.putInGraveyard 2016-09-05 11:47:52 -04:00
LevelX2
3d19637e85 Added test for Oracle of Dust activated ability. 2016-09-04 17:41:33 +02:00
LevelX2
507ddd8711 * Necromancer's Magemark - Fixed replacement effect that was coded as triggered ability. 2016-09-04 17:14:27 +02:00
Samuel Sandeen
434be545f7 Merge remote-tracking branch 'magefree/master' 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
 2016-09-03 20:06:33 -04:00
Samuel Sandeen
ef5ed5256a Clean up the deprecated moveCards methods in Player 2016-09-03 20:04:12 -04:00
Samuel Sandeen
148f633672 Make the Counters API for card and permanent consistent. 2016-09-03 10:33:54 -04:00
LevelX2
ab2399cbe7 * Fixed that equipments with restrictions (e.g. Gate Smasher) were not unequipped if the equipped permanent did no longer fulfill the restrictions(fixes #2212). 2016-09-03 15:26:17 +02:00
Samuel Sandeen
85dc15c5dc Merge remote-tracking branch 'magefree/master' 2016-09-02 19:44:51 -04:00
cg5
8cbffb3e69 Fix Gratuitous Violence bug 2016-08-29 20:10:01 +02:00
cg5
2439b99031 Add tests for Gratuitous Violence - confirmed bug 2016-08-29 19:51:26 +02:00
drmDev
9126f06b17 Prowl tests marked as Ignored due to lack of support from test api, not necessarily failing test due to bug 2016-08-28 18:05:04 -04:00
Samuel Sandeen
282443c231 Add Subtype to the CardAttribute Framework 
This is a massive change. I’ve refrained from unrelated refactoring
when possible but there are still a lot of changes here.
 2016-08-28 17:30:10 -04:00
Derek M
61f6166f9d Merge pull request #2198 from cg5-/culling-scales 
Add Culling Scales
 2016-08-27 12:51:00 -04:00
michaelstephendavies
4dcb113761 Add Culling Scales 2016-08-27 18:45:33 +02:00
Eric McVicker
ebeb20681e No spells cast last turn transform fix to not transform turn 1 #2188 2016-08-23 20:25:28 -05:00