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

5050 commits

Author SHA1 Message Date
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
drmDev
9d9265e02b Delve bug comments, Delve should not target. See issue #1646 2016-07-25 06:08:31 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
LevelX2
171a8b336d * Urza's Incubator - Fixed the not working cost reduction. 2016-07-24 14:18:45 +02:00
LevelX2
e277337c98 Xmage 1.4.13v3 2016-07-24 10:54:17 +02:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
bonefish
f4db49ea2d - Used newer moveCards method in AuraSwapAbility. Take number 2 due to an unstable mind. :) 2016-07-17 20:17:51 -05:00
jeff
f93f0cefb5 - Used newer moveCards method in AuraSwapAbility 2016-07-17 19:58:59 -05:00
drmDev
f807fed12c Foul Tongue Shriek bug fix - filters attacking creatures you control 2016-07-17 06:41:26 -04:00
Neil Gentleman
6fadbd3058 not all BecomesBlockedByCreatureTriggeredAbility share the same filter 2016-07-16 14:00:37 -07:00
Neil Gentleman
a3836f6ec7 Act of Aggression can only target opponent's creatures 2016-07-16 13:59:49 -07:00
bonefish
47ed193dff - Fixed text issue with GainControlAllEffect 2016-07-15 21:05:19 -05:00
jeff
bc1f4e409c - Fixed Aura Swap bug #2025. 2016-07-15 15:30:47 -05:00
spjspj
09cc97dd85 spjspj - Fix copy's owner for Mirrorwing Dragon (EMN) 2016-07-16 03:11:06 +10:00
LevelX2
e5117a967d * Mirrorwing Dragon - Fixed wrong target handling. 2016-07-15 18:14:38 +02:00
LevelX2
88d66784df * Crop Sigil - Fixed that it can't be activated without both a creature and land in the graveyard (fixes #2079 ). 2016-07-15 14:25:25 +02:00
LevelX2
4bdc4936f0 * Fixed Mid's Dilation bugs (fixes #2077). 2016-07-14 17:14:06 +02:00
LevelX2
fc1a1523c5 * Gideon, Champion of Justice - Fixed that the P/T did not change if loyality counters were added after using the 0 ability. 2016-07-13 17:04:52 +02:00
LevelX2
20fa414838 * Gideon, Champion of Justice - Fixed a bug that Gideon dies if its ability to make it a creature was used. 2016-07-13 12:25:54 +02:00
fireshoes
96e88d7350 [EMN] Fixed tooltip text on some green, gold, artifact, and land cards. Added Emrakul's Evangel's missing TapSourceCost. 2016-07-12 23:10:37 -05:00
drmDev
0185b45e2d SacrificeAllTriggeredAbility zone detection fix. Battlefield, not all 2016-07-12 18:03:37 -04:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
emerald000
c322b9adad [EMN] Fixed melding not working after the meld pieces return to the battlefield. 
Such as returning from under an Oblivion Ring.
 2016-07-11 22:28:24 -04:00
drmDev
7261452413 SacrificeAllTriggeredAbility bug fix. fixes #1736 2016-07-11 22:04:34 -04:00
Quercitron
c334d98564 [EMN] Fix filter by name in the MeldCondition. 2016-07-12 02:18:36 +03:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
54ad8a6ec0 MeldCard prevented possible NPE during test project build. 2016-07-11 17:10:14 +02:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
LevelX2
4522eda79c Fixed a bug of PutTokenOntoBattlefieldCopyTargetEffect causing Myriad tests to fail. 2016-07-08 12:14:38 +02:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00
drmDev
dfece2d268 small fix on default values 2016-07-04 10:11:34 -04:00
drmDev
0c747a1d41 adjusted default values for power and toughness 2016-07-04 10:08:30 -04:00
drmDev
8a4a1933b1 Soul Separator fixes 2016-07-04 06:26:26 -04:00
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00
drmDev
a4dc6a12b8 Soul Separator (EMN) 2016-07-03 21:27:33 -04:00
LevelX2
7f4fc245cd * Fixed some cards that choose a subtype as entering the battlefield that did not work for copied permanents (e.g. Brass Herald for Mormir format). 2016-07-03 21:43:12 +02:00
LevelX2
fd60e43a03 * Fixed a problem with UNDO/rollback setting the wrong active player (fixes #2046). 2016-07-03 18:14:18 +02:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
drmDev
e1bd9a5331 EmrakulsEvangel fix 2016-07-03 06:22:32 -04:00
LevelX2
b85af92942 * Fixed bug concerning Escalate's mana cost. 2016-07-03 10:30:18 +02:00
drmDev
41326affb5 Emrakuls Evangel (EMN) 2016-07-03 04:09:46 -04:00
emerald000
2e3f963363 [EMN] Implemented Escalate. Added Blessed Alliance. 2016-07-02 03:08:39 -04:00
emerald000
c8790f34ad [EMN] Fixed Emerge not caring about timing restrictions. 2016-07-02 02:12:39 -04:00
LevelX2
2874996994 Merge pull request #2032 from draxdyn/hold_priority 
Hold priority on Ctrl+click
 2016-07-01 16:00:20 +02:00
emerald000
3ca28d2eb6 [EMN] Implemented Emerge. Added Elder Deep-Fiend. 2016-07-01 01:15:56 -04:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click 
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
 2016-06-29 19:57:45 +02:00
fireshoes
d844c6056a [EMN] Added 6/29 spoilers to mtg-cards-data.txt. Implemented several cards (will be testing with the clearImage fix in). 2016-06-29 10:01:00 -05:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6 
Add support for F6
 2016-06-28 09:16:09 +02:00
fireshoes
fd29307ad4 [EMN] Added additional 6/27 spoilers to mtg-cards-data.txt Fixed Identity Thief's translated name. Implemented several new EMN cards. Fixed rules text on several tap and don't untap cards. 2016-06-27 19:33:05 -05:00
spjspj
2eb68403cf spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:54:59 +10:00
draxdyn
62d5d45a45 Add support for F6 
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
 2016-06-24 21:34:30 +02:00
LevelX2
185f56a7da * Fireblast - Fixed that a wrong text was shown for the land sacrifice. Also that the spell was wrongly marked as castable also if only one mountain was on the battlefield. 2016-06-20 16:23:03 +02:00
LevelX2
c15719b36b Fixed the transform message shown in the game log. 2016-06-20 16:21:52 +02:00
LevelX2
e74f5995cb Fixed some more possible null pointer exceptions. 2016-06-18 14:46:35 +02:00
LevelX2
7e9d285a49 Fixed some possible null pointer exceptions. 2016-06-18 12:56:25 +02:00
LevelX2
34668ba5d9 Fresh Meat, Caller of the Claw - Fixed problem with watchers using the same internal name. 2016-06-18 11:34:39 +02:00
LevelX2
6a973f1f7b Some minor changes. 2016-06-17 18:50:57 +02:00
LevelX2
e334d85078 * Willbender - Fixed that target of abilities could not be changed. 2016-06-17 15:11:05 +02:00
shootbot
1bae2b0b1e Fixed Leeching Sliver bug 
Following bugs fixed:
No life loss from a trigger when Leeching Sliver attacks a planeswalker
No life loss from a trigger when Leeching Sliver doesn't attack a player
and another sliver does
 2016-06-16 19:51:20 +06:00
spjspj
51a1c8d345 spjspj - Fixes for KormusBell not creating 1/1s from swamps. Copies of ContinuousEffect weren't having dependendToType set (was defaulting to null). Add addDependencyType to UrborgTombOfYawgmoth and setDependedToType to KormusBell. 2016-06-14 22:30:06 +10:00
spjspj
b751e69eec spjspj - Fix possible npe for Clockspinning and change return code from apply. Also fix possible npe for adding counters 2016-06-09 01:23:19 +10:00
LevelX2
187866c979 Awaken - Fixed a problem with the rule text of cards with Awaken. 2016-06-05 12:35:00 +02:00
LevelX2
85bc7549fa * Added Custodi Squire (2 votes), Nightshade Assassin (2 votes), Seize the Day (2 votes) from the Card Requests - JUNE list. 2016-06-04 12:21:47 +02:00
Alex Marcotte
95e4e3ea29 Text import will automatically start sideboard after a single blank line. Added a JUnit test for TxtDeckImporter. 2016-05-30 23:03:43 -04:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
fc4133e098 Merge pull request #1952 from aastrand/master 
Make it possible to play lands using hideaway
 2016-05-29 10:18:45 +02:00
LevelX2
9953107171 Some changes to Lost Auramancers. 2016-05-29 09:22:03 +02:00
Kranken
5f7d710b5e Make sure lands via hideaway respects 305.2 2016-05-28 14:07:40 +02:00
LevelX2
24fe679c34 * Commander mulligan - changed to Vancouver mulligan rule. 2016-05-26 15:33:41 +02:00
Kranken
f06e6a7bbb Make it possible to play lands using hideaway 
Previously lands were not playable due to the
ignoreTimings flag being set to false.
Added checks for the hideaway rulings regarding lands.
 2016-05-25 20:43:17 +02:00
LevelX2
b2d136a940 Merge pull request #1940 from wetterlicht/master 
Implemented various Darksteel cards
 2016-05-23 13:19:05 +02:00
LevelX2
f44987aa37 * Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs. 2016-05-22 16:02:10 +02:00
Quercitron
f815148424 * Runeflare Trap - Fix alternative cost condition (fixes #1943). 2016-05-20 03:26:42 +03:00
LevelX2
d4d486458f Merge pull request #1942 from magefree/rating-system 
Rating system
 2016-05-18 16:29:25 +02:00
Nathaniel Brandes
95b2d76ab1 Fix countering of spell copies. 2016-05-18 02:33:16 -07:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
Quercitron
972d59aa37 Add user rating using Glicko rating system (#1498) 2016-05-17 17:22:14 +03:00
Nathaniel Brandes
11158d5fa4 Fix casting spell with no cost. 
Ancestral visions should now correctly not be castable with Jace,
Telepath Unbound and be castable for free with Sins of the Past and its
ilk.
 2016-05-17 00:59:53 -07:00
Nathaniel Brandes
9e4442547d Fix additional costs with Flashback. 2016-05-17 00:20:51 -07:00
wetterlicht
140d7e9376 Added Filter to BecomesBlockedByCreatureTriggeredAbility 2016-05-16 22:57:28 +02:00
LevelX2
20138891fe * Fixed that a delayed sacrifice source effect could create a null pointer exception. 2016-05-16 11:07:18 +02:00
LevelX2
88e744c04c * Some fixes to tests and sacrifice cost. 2016-05-15 20:33:06 +02:00
spjspj
f9e363fb30 spjspj - Update Rich Man draft to allow Random packs 2016-05-15 23:52:13 +10:00
spjspj
5ee4b5193e spjspj - Modify Rich Man draft to be random 2016-05-15 18:50:59 +10:00
Fenhl
4b113afe64 Merge pull request #1933 from fenhl/parallel-evolution 
Implement Parallel Evolution
 2016-05-14 06:51:38 +00:00