1950 commits

Author	SHA1	Message	Date
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