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

2056 commits

Author SHA1 Message Date
LevelX2
b93ff11aeb Added possibility to set a flag for effects that causes to call game.applyEffects() after the effect is resolved. 2013-07-17 11:45:22 +02:00
Li REN
0802d0433c [minor] clean up 2013-07-17 04:53:03 -04:00
Li REN
4529efa773 Change one shot effect resolving function. Resolve continuous effects after each one shot effect resolved. 2013-07-17 04:40:09 -04:00
LevelX2
2bfc5373fe Fixed a bug in tournament that eliminates opponent of player that quits e.g. in first game. 2013-07-17 00:37:37 +02:00
LevelX2
9838dea551 Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators . 2013-07-16 17:39:02 +02:00
LevelX2
001f8ec1e6 Added missing changes of renaming quitted to quit. 2013-07-16 10:16:35 +02:00
LevelX2
f63a64e6cf [minor] Some text renaming. 2013-07-16 00:06:15 +02:00
LevelX2
26ca873eb6 [minor] Some text renaming. 2013-07-15 23:56:10 +02:00
LevelX2
73160df305 Added option to deactivate target copy for CreateDelayedTriggeredAbilityEffect. 2013-07-15 20:36:30 +02:00
LevelX2
4721c6aaca Fixed handling of sacrifice Planeswalker or Legend permanent caused by new rule for AI choose target. 2013-07-15 19:56:01 +02:00
North
7db8f5e37e * fixed ControlsPermanentCondition 2013-07-15 20:25:30 +03:00
Michael Ludwig
d2ac0c48db Refactored inner classes and fixed tab problem from previous commits 2013-07-15 12:50:36 -04:00
LevelX2
ded726d2ef Prevent that the tournament sub tables are deleted by expire check (delete logik must be added). 2013-07-15 15:03:38 +02:00
LevelX2
f1ce18cccf Changes Legendary and Planeswalker uniqueness rule to new rule behaviour from 20130713. 2013-07-15 15:01:40 +02:00
LevelX2
178b4cb158 Fixed random set for basic land definition. (Fixed issue #274) 2013-07-15 13:27:12 +02:00
LevelX2
bc9dca4d8a Fixed some handling to possible NPEs. 2013-07-15 00:53:30 +02:00
LevelX2
78b6a04cf5 * Voracious Dragon - Fixed possible null pointer exception. 2013-07-14 23:51:15 +02:00
Noah REN
121c6687de Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-14 03:10:34 -04:00
Li REN
d0787fb9fa fix a bug that cause ControlsPermanentCondition effect works incorrectly. 2013-07-14 03:10:12 -04:00
Michael Ludwig
794995f9f0 Added Edric, Spymaster of Trest and Wheel of Fortune. Added DiscardHandAllEffect for future use. 2013-07-14 02:41:43 -04:00
Noah REN
670864d78b Revert "fix a bug that cause ControlsPermanentCondition effect works incorrectly. This effect was applied in totally 189 cards ?!" 
This reverts commit bc2b2b4c4a.
 2013-07-14 02:14:48 -04:00
Li REN
bc2b2b4c4a fix a bug that cause ControlsPermanentCondition effect works incorrectly. This effect was applied in totally 189 cards ?! 2013-07-14 01:41:03 -04:00
Jeff
951b944555 - Little fixes 2013-07-13 11:36:38 -05:00
Li REN
65500060eb Update sideboard validation to new rules 2013-07-13 04:12:44 -04:00
Li REN
f68df5d24b Magic 2014: add Guardian of the Ages 2013-07-13 03:34:36 -04:00
Plopman
79caa415bf Equip ability can be use only for equipment permanent 2013-07-12 18:58:53 +02:00
LevelX2
7e0c1fd6b7 [M14] Added 5 cards. Fix to Oath of the Ancient Wood. 2013-07-12 08:15:50 +02:00
LevelX2
30dce7cce3 Some changes to the framework classes. Added ControllerGotLifeCount DynamicValue. 2013-07-11 15:06:36 +02:00
LevelX2
7abc459f45 Added RevealLibraryPutIntoHandEffect and made change to text generation of FightTargetsEffect. 2013-07-10 16:48:40 +02:00
LevelX2
76b98535ca Small improvement to tooltip text generation. 2013-07-10 14:12:32 +02:00
LevelX2
d5efeb3e95 Moved copy copy statement from PermanentImpl to MageObjectImpl object. 2013-07-10 14:12:05 +02:00
LevelX2
f9c79e509f * Mana Bloom - Fixed that Mana Bloom couldn't be used after cancel or undo (fixes #255). 2013-07-10 11:58:40 +02:00
LevelX2
3c1d61b84d [M14] Added 3 green cards. 2013-07-09 23:59:22 +02:00
LevelX2
f8b81f7a52 [M14] Added 9 black cards. 2013-07-09 16:08:43 +02:00
LevelX2
461c6e971e Changed tooltip text generation of DiscardTargetEfect. 2013-07-09 16:08:01 +02:00
LevelX2
18221a6513 Added and used ExileCardYouChooseTargetOpponentEffect. 2013-07-09 14:30:47 +02:00
LevelX2
1932f49969 Extended and used DiscardCardYouChooseTargetOpponentEffect for more cards. 2013-07-09 14:30:15 +02:00
LevelX2
544d1023fb Cleaned up and improved CardsPutIntoGraveyardWatcher. 2013-07-09 14:28:52 +02:00
LevelX2
6125661239 Added FilterInstantOrSorceryCard. 2013-07-08 17:02:14 +02:00
LevelX2
5a8a7b19de Client add land set search uses now ExpansionRepository. 2013-07-07 18:23:31 +02:00
LevelX2
0f3b760333 Added boosters and basicLands to ExpansionInfo. 2013-07-07 18:21:22 +02:00
North
e1fdae81e2 Improved fix for subtype/supertype display issue 2013-07-07 15:19:14 +03:00
LevelX2
9d4746c318 * Fixed bugs in display of subtype and supertype in card editor (workaround) should be better fixed directly in card repository handling. 2013-07-07 11:17:16 +02:00
North
200a565a9d Merged DeckValidator interface with DeckValidatorImpl 2013-07-06 11:08:36 +03:00
North
d9b37cc12a extracted method for loading a card in Deck class 2013-07-06 10:46:02 +03:00
LevelX2
9e5f3887bf Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-06 00:44:43 +02:00
LevelX2
0f32fc72de Solution for the deck editor / sideboarding / construct - mockcards problem. 2013-07-06 00:44:13 +02:00
LevelX2
0eaf9dd268 Some change to match timer (in progress). 2013-07-06 00:43:39 +02:00
Nicolas
ff5d16e132 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-05 18:51:20 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
LevelX2
3b8a75588b Fixed a problem, that images of copied tokens were not shown. 2013-07-05 18:48:55 +02:00
Plopman
d7f6084e4d Fixed Return from graveyard 2013-07-05 18:47:42 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
LevelX2
9d5327da7a * Rag Dealer / Serene Reembrance - Fixed target handling for AI. 2013-07-04 08:26:26 +02:00
Plopman
f43b3d1ee2 Added "tapped" option for putOntoBattlefield. Fixed amulet of vigor 2013-07-03 21:24:47 +02:00
Plopman
ba09f43f56 Fixed pay life cost 2013-07-03 21:20:57 +02:00
North
96ff08dc9a Merge branch 'decouple-client' 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-07-03 21:42:40 +03:00
LevelX2
023ae007a5 DeathtouchAbility - Added reminder text. 2013-07-03 20:19:37 +02:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
LevelX2
35433e55b8 Show match time value in table view. 2013-07-02 17:02:03 +02:00
Jeff
fdb38b886d - Added Tainted Sigil, Singe-Mind Ogre, and Sigil Captain. 2013-07-01 16:27:41 -05:00
North
ae86414658 Removed getAllCards method from CardRepository 2013-07-01 23:46:27 +03:00
LevelX2
ef811ff0bf Improved state handling of tournament panel. 2013-07-01 20:26:55 +02:00
LevelX2
469e9f3519 Fixed a bug of AffinityForArtifactsAbility causing bug if artifact had an activated ability. 2013-07-01 20:26:18 +02:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
7c5f1efe71 * Advent of the Wurm - Removed the expansion reference to RTR of the token. That led to showing the card as RTR card. 2013-07-01 14:25:09 +02:00
LevelX2
71e3670d0c * Prowl ability - Fixed the bug, that creatures with Changeling did not count for Prowl. 2013-07-01 00:08:46 +02:00
Jeff
4c423c6e7e - Added Esper Stormblade, Grixis Grimblade, and Thopter Foundry. 2013-06-30 11:59:31 -05:00
North
1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-06-30 11:26:40 +03:00
LevelX2
64bb951cc6 * Prison Term - Fixed tht the enchantment did not move to new creature caused by bug in EntersBattlefieldAllTriggeredAbility. 2013-06-30 08:35:51 +02:00
LevelX2
3572cbdc87 * Slice onto arcane - Fixed a bug that splice cards of opponents were counted as own splice cards. Leading to lock down the client. 2013-06-29 20:50:13 +02:00
North
d6ac1070c5 filtered out split card halves in card searches 2013-06-29 18:00:43 +03:00
Plopman
62fa1d3b31 Fixed FilterCreaturePermanent 2013-06-29 16:24:44 +02:00
North
4b4f73fea1 fixed display of lands 2013-06-29 16:58:25 +03:00
North
a43bc8bed6 fixed issue where second face was considered a card 2013-06-29 12:52:43 +03:00
LevelX2
94f50117b1 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-28 22:56:02 +02:00
LevelX2
ea7bfdfc21 * Swamps of Ice Age set - Corrected wrong collector numbers (were shown as Sulforous Springs). 2013-06-28 22:53:56 +02:00
Plopman
7dbbac4da3 Added subtye parameter to FilterCreaturePermanent and FilterControlledCreaturePermanent 2013-06-28 22:25:22 +02:00
LevelX2
b5ea4ff7ac * Kicker - Fixed a bug that you could cast the kicker card with kicker without paying costs. 2013-06-28 21:56:28 +02:00
Plopman
e2bed35cfb Added EnchantedCreatureColorCondition 2013-06-28 20:43:48 +02:00
LevelX2
0d3244b8a1 Fixed Jhoira of the Ghitu. 2013-06-28 14:26:32 +02:00
LevelX2
aeb5bb8a74 * Sturdy Hatchling - Fixed the comes into play effect beeing a replacement instead of a triggered effect. 2013-06-28 08:15:02 +02:00
North
988efec96c moved MockCards to mock package 2013-06-27 23:39:09 +03:00
Jeff
528f49bfe8 - Added Double Negative and Knight of New Alara. 2013-06-27 11:56:37 -05:00
LevelX2
3a9c5f709a * Kicker added support for Kicker X. 2013-06-27 16:27:36 +02:00
LevelX2
4676b617da Some rule text generation improvement for ExileFromGraveCost. 2013-06-26 22:04:45 +02:00
LevelX2
1f34e69c85 Added checking if file for deck importer exists. 2013-06-26 22:04:04 +02:00
LevelX2
c8c1680084 Some improvements for Splice onto Arcane Ability (game log text, reveal all spliced cards at once). 2013-06-26 22:03:12 +02:00
North
8287cbaaf0 Added MockSplitCard 2013-06-26 22:28:33 +03:00
North
d819053930 Moved MockAbility to stand alone class 2013-06-26 20:34:34 +03:00
North
f57f6e6d91 Removed StringUtils (JDK7) dependency 2013-06-26 19:59:59 +03:00
LevelX2
1bd3f6d318 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-26 18:30:24 +02:00
Jeff
afab33d65f - Added Shield of the Righteous 2013-06-26 11:14:28 -05:00
LevelX2
725ee6e042 Added SpliceOntoArcane Ability. It's working but it will need some handling improvements. 2013-06-26 17:34:14 +02:00
LevelX2
5591059e53 AbilityImpl code cleanup. 2013-06-25 21:46:11 +02:00
Plopman
980298d0ef Modify TriggeredManaAbility for choices 2013-06-25 20:29:26 +02:00
LevelX2
20db0b8c9c * Added Prowl ability. 2013-06-24 21:33:19 +02:00
LevelX2
e1ae922214 Some match time options added. Set the deafult macth time to 25 minutes per player. 2013-06-24 17:09:21 +02:00
LevelX2
9b6db41923 * Guttersnipe - Fixed a bug that the triggered damage to opponents did not trigger ability of Curiosity if it enchanted Guttersnipe. 2013-06-24 00:08:53 +02:00
LevelX2
7f2a9250ba Added DiscardHandControllerEffect. 2013-06-23 18:04:31 +02:00
LevelX2
57d5ddc5b9 Added possibility to use echo with costs that are no mana costs. 2013-06-23 15:12:05 +02:00
LevelX2
4977504eaf OpponentCastsSpellTriggeredAbility added Zone parameter. 2013-06-23 15:11:35 +02:00
LevelX2
a83ccc4dec * Suspend Ability - added parameter to set short rule text. 2013-06-23 15:10:51 +02:00
LevelX2
72ca119ece [minor] Fixed rule text generation. 2013-06-23 02:54:30 +02:00
LevelX2
0e87313e1a CounterPredicates works now with card counters. Handle Exile to Exile movement. 2013-06-23 02:53:55 +02:00
LevelX2
621bc4e1ce * Added Entwine ability. 2013-06-22 23:00:39 +02:00
LevelX2
853810ce45 Added support for casting modal spells or activating modal abilities with more than one mode to choose. 2013-06-22 19:35:22 +02:00
LevelX2
49ea20b1c8 Added ActivateAsSorceryManaAbility. 2013-06-22 01:57:48 +02:00
LevelX2
3e1b0f5fce Added a mode to allow TargetCardInExile in all exile zones. 2013-06-22 01:57:21 +02:00
LevelX2
0ab055c0f8 Added default value for priority time. 2013-06-22 01:56:43 +02:00
LevelX2
738efcc47f Added option to select time limit (also none) on match or tournament creation. 2013-06-21 21:34:06 +02:00
LevelX2
514d21375c [minor] SunburstCount prevent exception. 2013-06-21 21:30:24 +02:00
LevelX2
250f860298 * Retrace Ability - Added Reminder text. 2013-06-21 21:28:19 +02:00
LevelX2
881792c36d Added Zone as parameter for SpellCastTriggeredAbility. 2013-06-21 15:42:29 +02:00
LevelX2
023e4f94b5 * Suspend Ability - Added support for gaining suspend during game (Epochrasite). 2013-06-20 16:53:05 +02:00
LevelX2
53835f9b22 * Modular Ability - Added support for Modular-Sunburst. 2013-06-20 16:52:03 +02:00
LevelX2
212e53eb75 * Sunburst Ability - Fixed reminder text. 2013-06-20 16:51:29 +02:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
LevelX2
beb3affa7c Some changes to Suspend (not finished) and AddCountersSourceEffect. 2013-06-20 08:41:50 +02:00
magenoxx
b6fddc301c Merge branch 'master' of https://github.com/magefree/mage 2013-06-20 00:20:42 +04:00
North
f0578942c6 NightCards metadata added to CardRepository on scan 2013-06-19 23:05:39 +03:00
North
1b3a51484e replaced Card instances in client with MockCard 2013-06-19 22:53:53 +03:00
North
e9b81dd006 added MockCard (for display only) 2013-06-19 22:36:16 +03:00
LevelX2
a359546fe9 Added SourceTappedCondition. 2013-06-19 16:16:17 +02:00
LevelX2
fcff65ca34 Fixed some unlean code. Added CardUtil method to get card and ZoneChangeCounter specific exileId. 2013-06-19 16:15:58 +02:00
ludwig.hirth
80beadbee2 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-19 16:12:36 +02:00
LevelX2
13af25bd1d * Seasinger - Fixed a bug that the controlling effect of target creature was reactivated if Seasinger was tapped again, also if not the same creature was targeted again. So Seasinger could control multiple creatures with untapping and using the control ability again. 2013-06-19 16:12:11 +02:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
North
60289b43de CardScanner now adds Expansions to the ExpansionRepository 2013-06-18 22:46:42 +03:00
North
0166975e83 refactored getSetCodes to be used from ExpansionReposiitory 2013-06-18 22:46:09 +03:00
LevelX2
1ec2b46e66 * InfectAbility - Added reminder text. 2013-06-18 21:45:15 +02:00
North
e2152c59a2 added ExpansionRepository 2013-06-18 22:44:34 +03:00
LevelX2
f62d9a9a94 * Added DelveAbility. 2013-06-18 17:15:51 +02:00
LevelX2
9c6db9405a * UnearthAbility - Fixed that unearthed creatures had no haste. 2013-06-18 15:14:53 +02:00
LevelX2
03b5aea229 Added DrawDiscardTargetEffect, improved DrawDiscardControllerEffect. 2013-06-18 08:33:27 +02:00
LevelX2
95a12028e6 Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent. 2013-06-17 17:00:17 +02:00
LevelX2
c6a283583a [minor] Some code cleaning. 2013-06-17 13:50:20 +02:00
LevelX2
dcf1b27dec Added reminder text to SunburstAbility. 2013-06-17 08:12:45 +02:00
LevelX2
8362ea3b00 [minor] Formatting. 2013-06-17 07:44:55 +02:00
North
d91813b08a removed Card dependency for image downloading 2013-06-16 18:13:51 +03:00
North
1d4b3a2be6 Merge branch 'constants-refactor' 2013-06-16 15:25:35 +03:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
LevelX2
3def3230ee [minor] rule text formatting. 2013-06-16 09:22:44 +02:00
North
4d16535709 removed unused metadata from ExpansionSet 2013-06-16 09:52:29 +03:00
LevelX2
5addb63757 * Changed indestructible to an ability according M14 rule change. Also fixed that for indestructible permanents the DESTROY_PERMANENT event was triggered what led to bugs with abilities like Totem Armor. 2013-06-15 17:57:01 +02:00
LevelX2
fb0d9c0f9d * Renegade Doppelganger - Fixed a bug that the copy effect did not end at end of turn and the copy was permanently renewed. 2013-06-15 09:43:01 +02:00
LevelX2
eeca9a66ca * Mul Daya Channelers - Fixed a bug that the mana givng ability did not work as mana ability. 2013-06-15 00:56:11 +02:00
LevelX2
b7a22aa283 * Sovereigns of Lost Alara - Fixed a bug that the effect attaching the aura to the attacking creature throws an error. 2013-06-15 00:24:10 +02:00
LevelX2
84df0f2c43 * Added tournament options for adjustable construction time and free mulligans 
* Added duel options for free mulligans
 2013-06-14 23:45:30 +02:00