6802 commits

Author	SHA1	Message	Date
spjspj	8e3daf54a9	Start adding in Dice Roll effects	2017-12-10 22:49:55 +11:00
Oleg Agafonov	dce69c18dc	+ improved deck import from deckstats	2017-12-09 18:52:24 +04:00
Oleg Agafonov	763594e579	type	2017-12-08 00:53:46 +04:00
Oleg Agafonov	5fc0393bc7	Deck editor: ... + added warning messages dialog after load/import decks with errors (instead throw exception); + added loading cursors on import-load decks; - fixed null exception error on empty/error deck loading;	2017-12-08 00:20:18 +04:00
Oleg Agafonov	1efc062f66	Decks importer: ... + added support for new decklist text format from deckstats.net (see #4228); + added new checks to text format (too many empty lines, too big card number: more then 100); + fixed double window popup on cancel/close import from clipboard window;	2017-12-07 23:14:22 +04:00
Zzooouhh	230233659b	Some naming changes, Butcher Orgg first strike fix	2017-12-07 11:13:27 +01:00
Oleg Agafonov	5b7ab0de7a	typo	2017-12-07 08:41:59 +04:00
Oleg Agafonov	66a70dd116	- Fixed #4220 - card viewer raise error with alternative card numbers; ... - Fixed potential error on getCardsByRarity; - Added inner checks for wrong booster max card numbers settings;	2017-12-07 08:01:54 +04:00
Zzooouhh	d8daec11d4	Fixed Butcher Orgg handling attackers/blockers leaving combat	2017-12-07 01:04:31 +01:00
Zzooouhh	d6a08fbdd7	NullPointerException fix	2017-12-07 01:01:52 +01:00
Zzooouhh	e1fdc3093a	Some other edits + small fix for Defensive Formation	2017-12-06 21:30:33 +01:00
Zzooouhh	5fec04935d	Optimization edit for assignDamageToBlockers	2017-12-06 20:31:54 +01:00
Zzooouhh	c6e69868fa	Test message cleanup	2017-12-06 19:50:06 +01:00
Zzooouhh	edd07d4f80	Implemented Butcher Orgg (the missing bits)	2017-12-06 19:46:13 +01:00
Zzooouhh	16513408fc	Cleanup #2	2017-12-06 17:05:30 +01:00
Zzooouhh	b48c37ea8f	Defensive Formation slight cleanup	2017-12-06 17:02:49 +01:00
Zzooouhh	47ef2a4ce4	Implemented Butcher Orgg (partially) ... Option to divide damage while being a blocker doesn't work for some reason	2017-12-06 16:31:36 +01:00
Zzooouhh	dcce07cfdc	Implemented Butcher Orgg	2017-12-06 15:00:09 +01:00
LevelX2	8fac7a3dc1	XMage 1.4.26V9	2017-12-03 18:15:16 +01:00
Zzooouhh	7d72172c60	Included Echo counter type	2017-12-02 16:36:54 +01:00
LevelX2	b2e3201ea4	[RIX] Added some cards. Added some spoiler texts to mtg-cards-data.txt	2017-12-02 13:39:30 +01:00
Zzooouhh	659e3d7015	Merge branch 'master' into master	2017-11-26 21:17:27 +01:00
Zzooouhh	32ef8a5047	Small damage fix	2017-11-25 09:10:01 +01:00
Zzooouhh	200e5e07bf	Hollowhenge Spirit fix (partial fix for #4172)	2017-11-25 08:48:21 +01:00
Zzooouhh	b035c436d5	Another small fix	2017-11-25 08:35:18 +01:00
Zzooouhh	a7514fc671	Added mustBlockAllAttackers	2017-11-25 07:49:30 +01:00
Zzooouhh	7cf73917e6	Added mustBlockAllAttackers	2017-11-25 07:47:39 +01:00
Zzooouhh	92e5d8de0a	multiAttackerDamage fix	2017-11-25 07:20:25 +01:00
LevelX2	53448e6dc4	Ficed a problem with Bestow, adding multiple times "AURA" subtype.	2017-11-24 12:30:15 +01:00
Zzooouhh	19ef8f47f2	Final fix	2017-11-23 10:07:54 +01:00
Zzooouhh	0e2096395a	Another watcher fix	2017-11-23 09:56:07 +01:00
Zzooouhh	ce3176adf2	Fix for Giant Turtle/Halls of Mist watcher	2017-11-23 09:32:14 +01:00
Zzooouhh	a40e80e9e5	Created new watcher for Giant Turtle	2017-11-22 20:21:30 +01:00
Zzooouhh	813219df2d	Some changes to how Defensive Formation handles lethal damage	2017-11-22 11:28:36 +01:00
Zzooouhh	bb56568ea1	Implemented Defensive Formation	2017-11-22 02:13:22 +01:00
Zzooouhh	877a98d3d5	Implemented Defensive Formation	2017-11-22 02:08:00 +01:00
Evan Kranzler	afcf3a43d2	fixed Simic Manipulator implementation	2017-11-21 16:42:27 -05:00
Zzooouhh	bbc5f4594b	Implemented Imprison	2017-11-21 17:03:15 +01:00
Zzooouhh	6164a631ba	Fix for Umbra Mystic	2017-11-20 19:17:14 +01:00
theelk801	ad249d7c6b	Merge pull request #4158 from Zzooouhh/master ... Implemented more cards & fix for Grinning Totem	2017-11-18 09:52:01 -05:00
Zzooouhh	8ffa590a08	Alleged text fix ... Will this mess up anything?	2017-11-18 06:59:31 +01:00
Zzooouhh	5cc042779a	Implemented False Orders and Balduvian Warlord	2017-11-17 23:45:40 +01:00
Zzooouhh	ad9b95553f	Implemented Tombstone Stairwell	2017-11-15 00:05:29 +01:00
Zzooouhh	5d1ef487bf	Text fix	2017-11-13 22:03:37 +01:00
Evan Kranzler	036bc12508	fixed delayed end step triggers not triggering if created during an end step	2017-11-11 10:21:17 -05:00
Zzooouhh	de21a86913	Implemented Telekinesis	2017-11-11 12:59:46 +01:00
Zzooouhh	c63da1bb67	Made choosing at least one color mandatory ... 10/1/2005: You can choose any single color or any combination of more than one color. You can't choose colorless.	2017-11-11 12:17:42 +01:00
Zzooouhh	a52c98aa25	Typo fix	2017-11-05 20:49:39 +01:00
LevelX2	f5f6f924f9	XMage 1.4.26V8	2017-11-04 18:50:00 +01:00
LevelX2	a5e80d66f1	Merge origin/master	2017-11-04 18:20:35 +01:00
LevelX2	0d46c68924	* Fixed some problems for handling concede during game init.	2017-11-04 18:19:41 +01:00
Evan Kranzler	cddae049d6	fixed life loss triggers triggering off of 0 life	2017-11-04 12:15:33 -04:00
LevelX2	9a28f8d678	* Fixed that conditional mana colors were not tracked correctly for abilities like Converge.	2017-11-04 16:48:13 +01:00
LevelX2	9704d21c82	* Fixed a problem with player leaving the game during multiplayer game.	2017-11-03 15:50:01 +01:00
LevelX2	9e4beb6b51	* Nettling Impl - Fixed that the conditional delayed destroy ability did not work corretly (fixes #4142).	2017-11-03 14:59:26 +01:00
LevelX2	583033ff3b	Merge pull request #4139 from Zzooouhh/master ... Implemented a whole bunch of cards + fixes for #4131, #4137, #4138 and #4090	2017-11-02 14:08:26 +01:00
LevelX2	02b97aa9b3	Some fixes to: Merge pull request #4129 from jerekwilson/master - Implementing 5 cards	2017-11-02 13:43:49 +01:00
LevelX2	7202e27891	Merge origin/master	2017-11-02 11:17:40 +01:00
LevelX2	b4ee3ff1da	Merge pull request #4101 from magefree/phasingFix ... Fixed how phasing is implemented	2017-11-02 11:00:33 +01:00
LevelX2	f1bbb37c81	Merge origin/master	2017-11-02 10:29:04 +01:00
Zzooouhh	f653ddb921	Another fix for #4090	2017-11-02 07:05:33 +01:00
Zzooouhh	9423c30245	Fix for #4131	2017-11-01 20:40:49 +01:00
Zzooouhh	6e1a3b1b11	Removed garbage imports	2017-10-26 16:06:16 +02:00
Zzooouhh	1296537765	Included new watcher for "you choose blockers..." effects	2017-10-26 15:54:52 +02:00
Zzooouhh	7afb7eb2c5	Merge branch 'master' into master	2017-10-25 16:15:07 +02:00
Evan Kranzler	3746fddf54	fixed Angelic Accord displaying the wrong amount of life gain required (fixes #4132 and #4133)	2017-10-25 07:24:49 -04:00
Zzooouhh	fe9ce16ed2	Reverted MeleeAbility.calculate	2017-10-25 01:10:02 +02:00
Zzooouhh	6a8ce4c6ea	Delete JohanVigilanceAbility.java	2017-10-24 17:04:35 +02:00
Zzooouhh	549f89ac20	Update Combat.java	2017-10-24 17:04:12 +02:00
Zzooouhh	58ff5e017a	Moved JohanVigilanceAbility	2017-10-24 17:01:46 +02:00
Zzooouhh	e82d640060	Implemented Johan	2017-10-24 06:12:10 +02:00
Zzooouhh	7c5562881b	Implemented Johan	2017-10-24 06:10:06 +02:00
Zzooouhh	b153a7c2a2	Implemented Custodi Soulcaller	2017-10-22 23:39:31 +02:00
Zzooouhh	db8e38b587	Implemented Johan	2017-10-22 16:48:47 +02:00
Evan Kranzler	f29141605b	fixed Nissa, Genesis Mage -10 forcing players to put 10 cards into play in order to continue	2017-10-22 09:16:51 -04:00
LevelX2	919ec2fade	Merge origin/master	2017-10-21 16:14:14 +02:00
LevelX2	58d3fc2328	Fixed player leaving/conceding handling.	2017-10-21 16:13:45 +02:00
Evan Kranzler	b30335e344	Implemented Momentum	2017-10-20 10:58:44 -04:00
Evan Kranzler	1452e10128	Implemented Waylay	2017-10-19 07:34:46 -04:00
Evan Kranzler	8cbffc89d8	updated some text and implementations	2017-10-18 14:53:30 -04:00
Evan Kranzler	08bdfcc961	updated some text and implementations	2017-10-18 14:45:30 -04:00
Evan Kranzler	474048bcbc	fixed implementation of Confusion in the Ranks	2017-10-17 14:02:47 -04:00
Evan Kranzler	ba31763a7a	Implemented Rally the Troops	2017-10-16 20:29:53 -04:00
Evan Kranzler	457269cb12	fixed some range of influence issues	2017-10-16 18:12:57 -04:00
Evan Kranzler	587e8a75ef	fixed phased-out permanents not being invalid targets upon resolution	2017-10-16 17:04:04 -04:00
Evan Kranzler	79d4c07d20	updated how Withering Wisps and limited use activated abilities are implemented	2017-10-14 09:04:45 -04:00
Zzooouhh	5735515a31	Implemented Ovinomancer	2017-10-14 10:22:53 +02:00
igoudt	81875d19dc	revert cardtextpredicate to fix issue #4091	2017-10-14 10:07:17 +02:00
Zzooouhh	eba43f1905	Create SacrificeAttachedCost.java	2017-10-12 23:14:09 +02:00
Zzooouhh	36fed5d72e	Create TapAttachedCost.java	2017-10-12 21:28:52 +02:00
Zzooouhh	c82f38e3df	(Credit where it's due)	2017-10-12 18:29:04 +02:00
Zzooouhh	c3c8148baf	Create SkipUntapStepEffect.java	2017-10-12 18:24:32 +02:00
Evan Kranzler	0fc3afb235	fixed Evangelize not being castable when caster controls no creatures. ... (fixes #4094)	2017-10-12 07:56:45 -04:00
Evan Kranzler	9b51694908	fixed embalm and eternalize sometimes giving the token to the wrong player	2017-10-11 13:09:39 -04:00
Evan Kranzler	ab632ef1d0	small fix	2017-10-11 08:35:33 -04:00
Evan Kranzler	81a1e81525	fixed being able to cast spells from an opponents hand when revealed. (fixes #4102)	2017-10-10 19:27:03 -04:00
Evan Kranzler	4116b58414	fixed Venser, Shaper Savant and other similar cards not properly removing copied spells from the stack (fixes #4072)	2017-10-10 16:58:40 -04:00
Evan Kranzler	80f21132eb	fixed Nivmagus Elemental being able to infinitely exile copied spells (fixes #4092)	2017-10-10 16:25:15 -04:00
Evan Kranzler	fdf3f831ca	updated cards which phase things out to properly handle indirect phasing ... (#4071)	2017-10-10 14:32:08 -04:00
Evan Kranzler	3d20e4dbef	changed how phasing is handled	2017-10-10 13:37:05 -04:00
theelk801	51f0e92103	Merge pull request #4100 from magefree/master ... merge	2017-10-10 11:25:00 -04:00
Evan Kranzler	118978e39d	text fixes	2017-10-09 12:23:14 -04:00
Evan Kranzler	f16b5881e8	fext tixes	2017-10-08 09:33:01 -04:00
Evan Kranzler	54b8f10c3c	text fixes and test fixes to fix how tests test text, then more text next	2017-10-07 16:08:06 -04:00
Evan Kranzler	14107b3d55	2 text 2 fixrious	2017-10-07 11:02:36 -04:00
Evan Kranzler	0075535650	so many text fixes	2017-10-06 22:00:06 -04:00
Evan Kranzler	bc2bfba02a	more text fixes	2017-10-06 18:28:22 -04:00
Evan Kranzler	3baabe2534	some text fixes	2017-10-06 16:55:46 -04:00
Evan Kranzler	a63e024ea4	initial setup for phasing fix	2017-10-06 12:29:14 -04:00
Evan Kranzler	0ea78d21ef	Implemented Spheres from Odyssey	2017-10-05 20:13:48 -04:00
Evan Kranzler	b320d1d0f0	Implemented Forgotten Harvest	2017-10-05 18:02:10 -04:00
Evan Kranzler	2733d736d5	fixed Curtain of Light targeting, updated how being unblocked is checked	2017-10-05 13:41:12 -04:00
Evan Kranzler	3b0b923b7c	Implemented Weathered Bodyguards	2017-10-05 13:31:05 -04:00
Evan Kranzler	8c20861e92	Implemented Kjeldoran Home Guard	2017-10-04 18:32:46 -04:00
Evan Kranzler	6725c50b4a	Implemented Elder Land Wurm	2017-10-04 14:19:10 -04:00
Evan Kranzler	1453fa46a7	Fixed Urborg's functionality, also fixed Scarwood Hag not removing forestwalk properly (#4088)	2017-10-03 15:54:42 -04:00
LevelX2	71336a916d	XMage 1.4.26V7	2017-10-03 18:41:06 +02:00
LevelX2	4a71f8af67	Some minot fixes /changes.	2017-10-03 17:24:35 +02:00
Evan Kranzler	de8ae96aaa	Fixed Hour of Eternity's targeting and another small fix that was causing an error	2017-10-02 20:55:02 -04:00
Evan Kranzler	67bc2fb6bb	Updated some power-setting and toughness-setting effects to the correct layers	2017-10-02 16:58:48 -04:00
Evan Kranzler	549103a2f0	some more changes to CDA effects, tested and working correctly	2017-10-02 16:32:36 -04:00
Evan Kranzler	6b2c20b29e	initial commit for changing CDAs interacting with Scarab God/God-Pharaoh's gift (untested)(#4082)	2017-10-02 12:48:15 -04:00
Evan Kranzler	ec3af50090	Implemented Rohgahh of Kher Keep	2017-10-01 11:24:52 -04:00
igoudt	b7cf08bee4	Merge branch 'master' of https://github.com/magefree/mage	2017-10-01 10:06:00 +02:00
igoudt	116104db58	replace loops in triggeredabilities to lambdas	2017-10-01 09:59:15 +02:00
Evan Kranzler	87f237c835	Implemented Moratorium Stone	2017-09-30 16:39:53 -04:00
Evan Kranzler	d15ed359ce	Implemented Infinite Hourglass, updated upkeep-only text generation	2017-09-30 11:14:37 -04:00
Evan Kranzler	ee422e8289	Implemented Skirk Alarmist	2017-09-29 18:28:48 -04:00
Evan Kranzler	bd0417d917	Implemented Sawback Manticore	2017-09-29 18:28:28 -04:00
Evan Kranzler	b25f8c8881	fixed Mind Control and related cards not properly changing control when stolen from another player's library	2017-09-29 18:28:06 -04:00
igoudt	7c34dad8cb	update cardtextpredicate	2017-09-30 00:07:25 +02:00
Evan Kranzler	851b729b0e	fixed emblems not being removed when a player leaves a multiplayer game	2017-09-28 19:41:31 -04:00
Evan Kranzler	f177ce14d2	fixed emblems not being removed when a player leaves a multiplayer game	2017-09-28 19:12:53 -04:00
Evan Kranzler	b70bf04b8e	replaced all "attacks each turn" with "attacks each combat" per the oracle update	2017-09-28 11:30:06 -04:00
Evan Kranzler	db6045c39a	Implemented Mistform Dreamer	2017-09-28 11:29:49 -04:00
Evan Kranzler	9797f4d23b	fixed Mana Web not taking colorless mana into account	2017-09-27 21:19:04 -04:00
Evan Kranzler	84c95b13ab	fixed stolen spells being uncastable when returned to their owner's hand ... fixes #4048, #3753, #3697, #2721, #2713, and probably more	2017-09-27 13:08:29 -04:00
Evan Kranzler	21d3db39c8	fixed color-changing effects removing subtypes	2017-09-26 20:30:52 -04:00
Evan Kranzler	330c0b9702	Implemented Mimeofacture	2017-09-26 09:59:55 -04:00
Evan Kranzler	f7ba5716e9	fixed player becoming monarch incorrectly triggering things when they're already the monarch ... fixes #3527	2017-09-25 20:23:34 -04:00
Evan Kranzler	66ff9c43c1	fixed not being able to cast face-down creatures at instant speed with effects like Winding Canyons and Teferi, Mage of Zhalfir	2017-09-25 20:22:27 -04:00
igoudt	b12b0e29b8	change subtype.contains() to hasSubtype()	2017-09-25 21:21:13 +02:00
theelk801	1951d4fdcc	Merge branch 'master' into master	2017-09-24 15:03:15 -04:00
Evan Kranzler	400ab04620	Implemented Trophy Hunter	2017-09-24 11:26:34 -04:00
Evan Kranzler	f8faae4bb3	Implemented Security Detail	2017-09-24 10:35:12 -04:00
Evan Kranzler	b1e0d49b58	Implemented Sound the Call	2017-09-24 10:16:17 -04:00
Evan Kranzler	52507dbd3d	Implemented Serra Paladin	2017-09-24 09:30:29 -04:00
Evan Kranzler	0681edfa48	updated defending player predicate again	2017-09-23 18:53:12 -04:00
LevelX2	eb842e3219	Merge origin/master	2017-09-24 00:28:21 +02:00
LevelX2	d866234e89	Xmage 1.4.25V6	2017-09-23 23:49:00 +02:00
LevelX2	3ac7fc2726	* Some fixes to possible exceptions.	2017-09-23 23:48:25 +02:00
Evan Kranzler	631acef6b9	updated defending player predicate	2017-09-23 17:40:42 -04:00
theelk801	dafd75e1ab	Merge pull request #80 from magefree/master ... merge	2017-09-23 17:30:43 -04:00
LevelX2	e6225e3ad3	Merge branch 'master' into adjustTargets	2017-09-23 19:27:45 +02:00
LevelX2	0714ae39dc	* Hope of Ghirapur - Fixed a problem with check if current object has daone the damage.	2017-09-23 19:16:21 +02:00
Evan Kranzler	843a09b074	fixed activated abilities not being controlled by the player who activated it (#4047)	2017-09-23 09:59:21 -04:00
theelk801	da176e2b7a	Merge pull request #79 from magefree/master ... merge	2017-09-22 22:57:56 -04:00
Evan Kranzler	59b38b76ec	(#4015) fixed enrage triggers triggering multiple times in combat, ... didn't fix triggers which use amount of damage dealt (Boros Reckoner)	2017-09-22 18:18:30 -04:00
Evan Kranzler	2a9def5f50	Implemented Elephant Resurgence	2017-09-22 16:02:34 -04:00
igoudt	cd31a94ed2	text fixes, gatecreeper vine etb is optional	2017-09-22 14:28:52 +02:00
Evan Kranzler	9384bf8df4	Implemented Apocalypse Sanctuaries	2017-09-21 21:20:42 -04:00
Evan Kranzler	0d49e385d5	small fix	2017-09-19 22:12:50 -04:00
Evan Kranzler	b0c3d6aee6	small fix	2017-09-19 21:56:55 -04:00
Evan Kranzler	bd415215f5	Legacy's Allure modified so its ability can be copied	2017-09-19 20:52:18 -04:00
Evan Kranzler	602eee1928	Vile Requiem modified so its ability can be copied, ... implemented Recantation, Rumbling Crescendo, Serra's Liturgy and War Dance	2017-09-19 20:29:33 -04:00
Evan Kranzler	ce68a1d9ed	Pentarch Paladin is now supported properly	2017-09-19 18:01:37 -04:00
Evan Kranzler	79d3bd24d5	cleaned up some cards, tested that the abilities can be copied	2017-09-19 15:40:45 -04:00
Evan Kranzler	e2a1fa50ea	moved some target choices to CardImpl, they should be properly copiable now	2017-09-19 12:50:19 -04:00
Evan Kranzler	96a3f40891	changed Ancient Hellkite, made predicate for cards/permanents defending player controls/owns	2017-09-19 11:58:55 -04:00
theelk801	2d577287d1	Merge pull request #77 from magefree/master ... merge	2017-09-19 10:32:28 -04:00
Evan Kranzler	7bb7754bb3	Updated how spell triggers get information about the spell that triggered them. ... This prevents countering the spell from removing the effect of the trigger.	2017-09-18 17:02:55 -04:00
Evan Kranzler	6f4d77fc0f	Implemented Gemini Engine	2017-09-18 10:40:15 -04:00
Evan Kranzler	356737075a	Revert "Skulk is now singleton" ... This reverts commit 6ca03a339a.	2017-09-17 19:57:54 -04:00
Evan Kranzler	6ab143c123	Implemented Mine Layer	2017-09-17 18:55:06 -04:00
LevelX2	1d5105c0bd	Xmage 1.4.26V5	2017-09-17 23:11:38 +02:00
theelk801	c32c5d41a2	Merge pull request #75 from theelk801/master ... merge	2017-09-17 15:31:03 -04:00
Evan Kranzler	9a57480f4b	Fixed Dual Nature	2017-09-17 12:42:59 -04:00
theelk801	a6b95db4fc	Merge pull request #73 from magefree/master ... merge	2017-09-16 21:57:19 -04:00
Evan Kranzler	e646c75487	Fixed Dowsing Dagger token	2017-09-16 21:46:12 -04:00
Evan Kranzler	dcddc91144	Updated cards which target cards with attribute x	2017-09-16 21:08:52 -04:00
Evan Kranzler	b3712b88c7	updated Hakim, Loreweaver	2017-09-16 21:06:56 -04:00
Evan Kranzler	856dcb54d5	updated abilities with x targets	2017-09-16 17:07:48 -04:00
Evan Kranzler	d68efc21c5	Changed some X cost abilities (untested)	2017-09-16 12:58:25 -04:00
LevelX2	2d6bcd83f4	xmage 1.4.26V4	2017-09-16 16:55:58 +02:00
LevelX2	563856434d	Some more minor fixes.	2017-09-16 16:03:12 +02:00
LevelX2	afd6bc080d	Removed exception for missing subType to prevent empty card list in older deck editors.	2017-09-16 15:14:52 +02:00
LevelX2	d66a9d1693	Some fixes to red cards.	2017-09-16 15:14:21 +02:00
LevelX2	21c3e2cf02	Some fixes to black cards.	2017-09-16 11:39:33 +02:00
LevelX2	53324c0f4d	Reverted making Menace a MageSingleton.	2017-09-16 10:38:10 +02:00
Evan Kranzler	217a17b864	Removed planeswalker uniqueness rule	2017-09-15 23:34:49 -04:00
theelk801	ecbc4950cd	Merge branch 'master' into master	2017-09-15 18:18:10 -04:00
LevelX2	7d748721da	[XLN] Added 10 cards.	2017-09-16 00:11:38 +02:00
theelk801	a62410d3e5	Merge pull request #67 from magefree/master ... merge	2017-09-15 17:33:51 -04:00
Evan Kranzler	6fe2eaf6a3	Implemented Shore Keeper	2017-09-15 16:51:11 -04:00
LevelX2	82d2953d7b	Merge origin/master	2017-09-15 21:57:54 +02:00
Evan Kranzler	58bba450e0	Added all XLN reprints	2017-09-15 13:24:25 -04:00
LevelX2	5996aa12e6	Trove of Temptation working for Human.	2017-09-15 17:51:54 +02:00
LevelX2	24c2c69a81	Merge master into TroveOfTemptation	2017-09-15 17:12:45 +02:00
Evan Kranzler	c611d71f30	Implemented Spiritual Asylum	2017-09-14 22:23:01 -04:00
Evan Kranzler	10a57b1594	Implemented Energy Storm	2017-09-14 21:12:25 -04:00
theelk801	ba85640c84	Merge pull request #3987 from theelk801/master ... Added XLN cards	2017-09-14 18:17:01 -04:00
Evan Kranzler	7663827a30	Implemented Vance's Blasting Cannons/Spitfire Bastion	2017-09-14 18:14:32 -04:00
LevelX2	d0dfd46c5f	Fixed problem that prevented project generation.	2017-09-14 23:45:48 +02:00
Evan Kranzler	73a8d64d5c	fixed Thraben Sentry	2017-09-14 13:38:25 -04:00
LevelX2	d9c601dd26	Trove of Temptation - Basic some changes to Combat and Human	2017-09-14 17:50:00 +02:00
Evan Kranzler	68a42726a8	Implemented Shadowed Caravel, generalized explore triggers	2017-09-14 11:19:29 -04:00
Evan Kranzler	1ae29e900a	Implemented Guided Passage	2017-09-14 10:02:32 -04:00
theelk801	6802b60d21	Merge pull request #3971 from theelk801/mairsil2 ... Fixed issues with Mairsil (I think) re:#3963	2017-09-14 08:00:56 -04:00
Evan Kranzler	98c2332b3c	a few small changes	2017-09-14 07:04:44 -04:00
Evan Kranzler	6ca03a339a	Skulk is now singleton	2017-09-13 20:38:29 -04:00
Evan Kranzler	b83e12f51c	Menace is now a singleton like other keywords	2017-09-13 15:38:02 -04:00
theelk801	c7cfca6677	Merge pull request #3977 from theelk801/master ... Implemented cards, updated spoiler	2017-09-13 11:08:21 -04:00
LevelX2	c70b548464	Some minor changes.	2017-09-13 17:05:37 +02:00
LevelX2	55917ccc63	* Anthroplasm - Fixed possible null pointer exception.	2017-09-13 17:05:09 +02:00
Evan Kranzler	cd58164b89	Implemented Celestial Gatekeeper	2017-09-13 10:30:35 -04:00
LevelX2	c3157bbcde	* Path of Ancestry - Fixed possible null pointer exception.	2017-09-13 14:52:47 +02:00
Evan Kranzler	69c7668bd0	Implemented Dowsing Dagger/Lost Vale	2017-09-12 16:27:10 -04:00
Evan Kranzler	a26c5a509f	updated various activated abilities	2017-09-12 12:31:00 -04:00
Evan Kranzler	9b25dd0e39	revamped how conditional and limited-use activated abilities are implemented	2017-09-12 09:33:12 -04:00
Evan Kranzler	3a6e2b080b	updated spoiler	2017-09-11 16:40:49 -04:00
Evan Kranzler	650f184ee6	Begin Mairsil fix	2017-09-11 16:26:30 -04:00
theelk801	31acee7624	Merge branch 'master' into subTypeSwitch	2017-09-09 11:16:47 -04:00
Evan Kranzler	f43950c4b8	Fixed various rule texts	2017-09-09 10:16:26 -04:00
Evan Kranzler	3cc178196e	Refactored more subtypes usages to enum	2017-09-08 11:05:58 -04:00
Evan Kranzler	252c941b4f	Refactored more subtypes usages to enum	2017-09-08 09:57:51 -04:00
igoudt	d79c57b907	Merge https://github.com/magefree/mage	2017-09-08 13:12:03 +02:00
igoudt	2355d35e04	small fixes	2017-09-08 13:11:58 +02:00
LevelX2	66c4aec499	* Conspiracy - Fixed that it doesn't revert creature types of non-permanent cards when it leaves the battlefield (fixes #3911).	2017-09-08 12:14:18 +02:00
Evan Kranzler	245bf2f2df	Refactored subtypes to enum	2017-09-07 21:18:19 -04:00
Evan Kranzler	0656f97d7c	Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt	2017-09-07 11:36:07 -04:00
Justin Herlehy	b6dceb28c8	Code Cleanup ... Deprecated SubTypeList methods that expect strings and List<String>. Readability cleanup for SubType Enum.	2017-09-06 20:38:11 -07:00
Evan Kranzler	e954de0012	Implemented Fathom Fleet Captain	2017-09-06 18:04:41 -04:00
Evan Kranzler	0f72c4fb22	Additional token effect text changes	2017-09-06 17:39:58 -04:00
Evan Kranzler	6fc78d1d78	Implemented Pirate's Cutlass, changed text templating for creating token effects	2017-09-06 16:21:06 -04:00
Evan Kranzler	fce99fa182	Implemented Conqueror's Galleon/Foothold	2017-09-05 19:39:04 -04:00
theelk801	1f92fbcf3e	Merge pull request #56 from magefree/master ... merge	2017-09-05 13:31:28 -04:00
Evan Kranzler	97e34dab49	Added Explore event	2017-09-05 13:27:45 -04:00
LevelX2	466e524d6e	Fixed possible exception during draft player repplacement.	2017-09-05 16:39:43 +02:00
LevelX2	0ce13bf676	* Grenzo, Havoc Raiser - Fixed that blocked the game.	2017-09-05 16:20:58 +02:00
Evan Kranzler	9e44a1f152	Implemented Huatli, Warrior Poet	2017-09-04 21:02:33 -04:00
Evan Kranzler	d0a4e5a420	Implemented Mavren Fein and Call to the Feast	2017-09-04 17:29:45 -04:00
TacomenX	518bae18df	[XLN] Deeproot Waters + Merfolk Hexproof Token	2017-09-04 01:29:20 -05:00
LevelX2	20a3f6a2c6	xmage 1.4.26V3	2017-09-03 08:21:48 +02:00
LevelX2	66c69e51a3	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
Evan Kranzler	54761f400d	fixed bug #3923	2017-09-02 13:06:13 -04:00
Evan Kranzler	a8abdba0ad	Implemented Huatli, Dinosaur Mage	2017-09-02 10:19:20 -04:00
igoudt	e2ad4a6654	Merge https://github.com/magefree/mage	2017-09-02 13:03:46 +02:00
theelk801	bda6658d79	Merge pull request #50 from magefree/master ... merge	2017-09-01 21:25:20 -04:00
Evan Kranzler	1f382a7ce7	Implemented Jace, Cunning Castaway (ultimate won't work correctly until planeswalker rule is removed) ... various other small changes as well	2017-09-01 21:20:05 -04:00
LevelX2	720351c065	Some minor user handling changes.	2017-09-02 00:46:24 +02:00
LevelX2	5bf12d227c	Some minor changes.	2017-09-01 23:50:07 +02:00
igoudt	43bb541876	Merge https://github.com/magefree/mage	2017-09-01 22:49:50 +02:00
igoudt	f0623d37c9	some cleanups	2017-09-01 22:48:42 +02:00
Evan Kranzler	d28de9e357	Implemented Shifty Doppelganger	2017-09-01 16:38:40 -04:00
LevelX2	84fe04b92d	Replaced exception handling of invalid deck submitting by a user message.	2017-09-01 20:05:26 +02:00
Evan Kranzler	029420a9a8	fixed enrage text	2017-09-01 09:57:11 -04:00
LevelX2	77f6f7b2b6	* Tawnos's Coffin - Fixed that it did not work correctly if abilities were copied by Mairsil, The Pretenderand and general rework.	2017-09-01 12:36:40 +02:00
spjspj	669ae56d6f	Allow Dinosaur to be selected in creature type dialog	2017-08-31 23:27:11 +10:00
Evan Kranzler	13c7c2f231	Implemented Treasure Map/Treasure Cove	2017-08-30 21:56:45 -04:00
Evan Kranzler	3fd7a34944	Implemented Captain Lannery Storm	2017-08-30 20:03:29 -04:00
theelk801	1f607e7429	Merge pull request #47 from magefree/master ... merge	2017-08-30 18:08:28 -04:00
Evan Kranzler	e4cf16f338	Implemented Revel in Riches, added Treasure tokens	2017-08-30 18:06:06 -04:00
theelk801	2ea174724c	Merge pull request #3901 from theelk801/master ... Implemented 4 XLN cards	2017-08-30 11:49:24 -04:00
Evan Kranzler	b2e7b02fd7	Implemented Tishana's Wayfinder	2017-08-30 11:46:16 -04:00
LevelX2	4d832326a3	* Added log message.	2017-08-30 17:31:06 +02:00
LevelX2	40689fe1b9	Fixed possible null pointer exception.	2017-08-30 17:07:57 +02:00
theelk801	6df548dc5d	Merge pull request #3900 from theelk801/master ... Implemented Infernal Denizen, Ripjaw Raptor and Sun-Crowned Hunters	2017-08-29 18:44:16 -04:00
LevelX2	cba7a510ea	* Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867).	2017-08-30 00:30:46 +02:00
Evan Kranzler	be2f27bfb3	added Enrage as an ability word	2017-08-29 18:22:10 -04:00
LevelX2	e909f5c801	C17 Added Portal Mage.	2017-08-28 16:50:00 +02:00
LevelX2	5660348f98	C17 Added Alms Collector.	2017-08-28 12:44:08 +02:00
LevelX2	ea4af25c77	* Goaded creatures able to attack the goading player (in multiplayer) (fixes #3891). ... * Grenzo, Havoc Raiser - Fixed trigger handling and null pointer exception.	2017-08-27 22:28:13 +02:00
Evan Kranzler	b888e8e634	Implemented Temporal Distortion	2017-08-27 11:08:47 -04:00
theelk801	ad893aee31	Merge pull request #44 from magefree/master ... merge	2017-08-27 11:08:13 -04:00
Evan Kranzler	4bf436b0f4	Fixed Duplicant getting boost from Commander in command zone (#3299)	2017-08-27 09:16:47 -04:00
LevelX2	cb15d4728d	* Dragon Tempest - Fixed a problem if damage was redirected (e.g. with Spellskite) - (fixes #3887).	2017-08-27 14:27:03 +02:00
Evan Kranzler	962ec40d4c	Fixed Nazahn not properly searching for his Hammer.	2017-08-27 08:07:57 -04:00
LevelX2	7e8dcef120	C17 added Seth's Tiger.	2017-08-27 10:57:14 +02:00
LevelX2	f35eee935c	* XMage 1.4.26V2	2017-08-27 08:04:18 +02:00
LevelX2	52897094b3	* Some chnages to chat, user and player handling.	2017-08-26 18:26:55 +02:00
LevelX2	e7a3fee8d7	* Teferi's Protection - Fixed that the damage prevention and protection from did not work correctly (fixes #3879).	2017-08-26 13:24:41 +02:00
LevelX2	cf7d718226	* Some minor changes.	2017-08-26 09:52:51 +02:00
theelk801	ed9320362d	Merge pull request #42 from magefree/master ... merge	2017-08-25 10:14:03 -04:00
LevelX2	04afe73f28	* Fixed that curses selected with Bitterheart Witch or Curse of Misfortunes could be retargeted (fixes #3858).	2017-08-24 16:08:58 +02:00
Evan Kranzler	255b81f143	fixed bug #3834	2017-08-23 21:26:39 -04:00
Evan Kranzler	c6029176d3	Implemented Varchild's War Raiders	2017-08-23 10:52:58 -04:00
Evan Kranzler	d0744486ad	small change	2017-08-23 09:40:11 -04:00
Evan Kranzler	c61651da69	Fixed bug #3777	2017-08-22 21:44:14 -04:00
Evan Kranzler	12cedf945d	Fixed bug #3835, stolen creatures that exploit themselves now trigger for the appropriate player	2017-08-22 21:34:14 -04:00
Evan Kranzler	e3faef4a52	Fixed several cards with ETB abilities that didn't use last known information properly	2017-08-22 13:35:44 -04:00
LevelX2	4c2d8cd8f8	* Improved payment handling of conditional monohybrid colored mana.	2017-08-22 17:51:48 +02:00
LevelX2	5b7fb59b52	* Sepulchral Primordial - Fixed that its ETB ability doesn't trigger if at least one opponent in range had no creature in the graveyard (fixes #3257).	2017-08-22 16:10:40 +02:00
theelk801	4d5e8d4a91	Merge branch 'master' into master	2017-08-22 09:31:16 -04:00
Evan Kranzler	8d85189262	Implemented Mairsil properly	2017-08-22 09:27:07 -04:00
LevelX2	1a4d6ea547	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:37:44 +02:00
LevelX2	2880b32444	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:27:18 +02:00
LevelX2	9ac7fe27f0	* Vindictive Lich (mode target handling not fixed yet).	2017-08-21 18:49:37 +02:00
Evan Kranzler	f33d9006c6	Implemented Mairsil but this is possibly game-breaking	2017-08-21 11:29:34 -04:00
Evan Kranzler	e0c48bfa4e	Implemented Mairsil almost	2017-08-21 10:07:40 -04:00
Evan Kranzler	ebc9b728dd	Implemented Grenzo, Havoc Raiser	2017-08-20 13:50:15 -04:00
Evan Kranzler	f4cdb77513	fixed bug #3857, recoded the C17 curses	2017-08-20 09:54:43 -04:00
LevelX2	09511cc151	* Assembled Alphas - Fixed that the triggered ability did not work.	2017-08-19 08:41:05 +02:00
LevelX2	a439f30c21	Fixed a bug that falsely ended players tournaments.	2017-08-19 07:46:47 +02:00
LevelX2	f4f23f615a	Merge origin/master	2017-08-18 00:26:07 +02:00
Evan Kranzler	53a666a580	Implemented Mathas, Fiend Seeker	2017-08-17 18:18:44 -04:00
LevelX2	c2d70fa1cc	Xmage 1.4.25V1	2017-08-18 00:12:57 +02:00
theelk801	b2270a7f10	Merge pull request #33 from magefree/master ... merge	2017-08-17 15:55:26 -04:00
LevelX2	db93e3f672	* C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds).	2017-08-17 21:36:55 +02:00
Evan Kranzler	87635cf1b9	Implemented Disrupt Decorum, implemented goading	2017-08-17 14:56:47 -04:00
LevelX2	0affb45264	* Curse of Opulence - Fixed a bug that could create game error (index out of bounds).	2017-08-17 20:35:36 +02:00
theelk801	df02c32b0d	Merge branch 'master' into c17KindredCycle	2017-08-17 11:13:44 -04:00
LevelX2	2b8737b026	* Fixed text of planeswalker to keep to only include type not name.	2017-08-17 01:11:03 +02:00
Saga\Robert	f69374be8c	- added a Triggered Ability for ETBs or Attacks	2017-08-17 00:18:58 +02:00
Evan Kranzler	341094dc00	Implemented Edgar Markov	2017-08-15 18:08:33 -04:00
Evan Kranzler	57d6a1d995	Implemented The Ur-Dragon, added Eminence as an ability word	2017-08-15 16:03:34 -04:00
LevelX2	118665dfd4	Minor change.	2017-08-15 01:56:48 +02:00
LevelX2	4b8e9c1525	Merge pull request #3810 from Eleros/C17 ... Implemented C17 Curse cycle	2017-08-14 23:10:52 +02:00
LevelX2	6244046330	* Some minor changes.	2017-08-14 16:48:48 +02:00
Saga\Robert	478a0b8ea8	- updated available set info of Zombie and Gold tokens ... - added Curse of Vitality - added Curse of Verbosity - added Curse of Disturbance - added Curse of Opulence - added Curse of Bounty - added Curse cycle to C17	2017-08-13 17:52:48 +02:00
LevelX2	1694daa4ab	Merge pull request #3801 from theelk801/master ... Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm	2017-08-13 16:28:10 +02:00
Saga\Robert	9a2ea73ec0	- added Rat token with Deathtouch	2017-08-12 19:19:35 +02:00
spjspj	10e4d20e47	Merge branch 'master' into master	2017-08-12 17:58:24 +10:00
spjspj	f41effe979	Implement Nazahn, Revered Bladesmith (C17)	2017-08-12 17:56:55 +10:00
Justin Herlehy	4e15194d08	Merge pull request #3784 from Eleros/feature/HASCON2017Promos ... Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight	2017-08-11 15:26:23 -07:00
theelk801	ff47290039	Merge pull request #20 from magefree/master ... merge	2017-08-11 18:20:53 -04:00
Evan Kranzler	fcd6edfe6f	Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording	2017-08-10 08:18:27 -04:00
LevelX2	a3e7aa6230	* Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786).	2017-08-10 07:04:32 +02:00
theelk801	3a52ce609d	Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter * Implement Brown Ouphe * Implemented Break Open * Implemented Carrion * Implemented Cephalid Pathmage * Implemented Cephalid Inkshrouder * Implemented Ceremonial Guard	2017-08-09 23:13:36 -05:00
Eleros	b770e8ba51	Merge branch 'master' into feature/HASCON2017Promos	2017-08-09 22:11:19 +02:00
Evan Kranzler	7838049c14	Implemented Carrion	2017-08-09 12:41:32 -04:00
theelk801	385e462f15	Implemented Epicenter, Infested Roothold, Brown Ouphe, Rust, Ouphe Vandals, Fatal Attraction, Fighting Chance, Arcbound Fiend, Carry Away, Caverns of Despair, Amulet of Unmaking, Aphetto Exterminator, Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound, Boa Constrictor, Bola Warrior, Brass Talon Chimera, Briar Patch, Brine Shaman, Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin (#3779) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 21:49:14 -05:00
theelk801	8b36b16b09	Merge pull request #17 from magefree/master ... merge	2017-08-08 17:44:15 -04:00
Evan Kranzler	e47798d6c9	Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 14:28:32 -04:00
igoudt	2ca7927580	AddCardSubtypeAllEffect uses SubType enum	2017-08-08 17:11:21 +02:00
Saga\Robert	05f5b99a99	- changed Autobot and Dinosaur to fantasy types	2017-08-07 22:35:08 +02:00
igoudt	19a8f3c4c1	fix fired event for eternalize	2017-08-07 22:30:34 +02:00
igoudt	4dc3419efa	fix some subtypes for becomesBasiclandTargetEffect	2017-08-07 22:26:17 +02:00
igoudt	8d52e995e8	change BEcomesBasicLandTargetEffect to use SubType	2017-08-07 21:58:59 +02:00
Evan Kranzler	515fb58bc0	Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor	2017-08-07 14:22:09 -04:00
Saga\Robert	21b892a9b4	-added EquippedMultipleSourceCondition (to check if permanent has 2 or more Equipments attached)	2017-08-07 17:03:21 +02:00
theelk801	c989fde625	Merge pull request #16 from magefree/master ... merge	2017-08-06 21:37:50 -04:00
Saga\Robert	2a9d8edee8	- added Autobot and Dinosaur Subtypes ... - added TransformedPredicate(checks isTransformed())	2017-08-07 01:28:17 +02:00
igoudt	ead0141b5b	fix spreading seas	2017-08-06 22:58:20 +02:00
igoudt	5d99bacf73	fix subtype in game state	2017-08-06 22:11:26 +02:00
igoudt	6336f82845	remove redundant cardgraphicinfo instances	2017-08-06 17:23:03 +02:00
igoudt	f793504ba0	remove hasSubType(String s)	2017-08-06 17:22:11 +02:00
Evan Kranzler	6a49135479	Implement Carry Away	2017-08-06 09:35:02 -04:00
LevelX2	9a1ce3f449	Merge pull request #3769 from Eleros/feature/HASCON2017Promos ... Feature/hascon2017 promos	2017-08-04 22:39:20 +02:00
Evan Kranzler	d9649fd54c	Implement Common Cause	2017-08-04 15:39:10 -04:00
Evan Kranzler	65004d1a5f	Fix Mindless Null and Can't Block effect	2017-08-02 14:21:08 -04:00
ingmargoudt	2192a517ce	Merge pull request #3774 from ingmargoudt/master ... fixing choosing creature types	2017-08-02 08:06:07 +02:00
igoudt	449e82a796	fixing choosing creature types	2017-08-02 08:04:26 +02:00
Saga\Robert	2e1a820040	- added gold color ... - added gold Dragon Token - edited new set data (H17) for Sword of Dungeons and Dragons	2017-08-01 14:55:17 +02:00
LevelX2	1e3f9bffc6	* Fixed that morphed permanents (face down) had wrongly the cumulative mana costs of their face-up side instead of 0(fixes #3726).	2017-08-01 12:20:05 +02:00
LevelX2	ad12c75c20	* Cinder cloud - Fixed the check for "dies this way".	2017-07-31 20:55:29 +02:00
LevelX2	7a1245e2fe	Fixed a problem of DiesTriggeredAbility that produced null pointer exception.	2017-07-31 20:42:32 +02:00
LevelX2	7b168a9d5e	* Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value.	2017-07-30 18:50:36 +02:00
LevelX2	69e239d2ed	Xmage 1.4.25V0 (update because of Log problem)	2017-07-30 08:54:37 +02:00
ciaccona007	bd4d00f031	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-29 20:08:04 -04:00
ciaccona007	d484991818	Fix problem in Permanent.destroy()	2017-07-29 19:07:25 -04:00
igoudt	89ac77e28a	clean ups, talk to interface rather than implementation	2017-07-29 23:55:11 +02:00
LevelX2	fe2ee5dfec	Xmage 1.4.25V0	2017-07-29 20:35:16 +02:00
LevelX2	6530b404c8	* Some Aftermath fixes.	2017-07-29 20:13:48 +02:00
LevelX2	0ef94a588c	* Fixed some null pointer or other exception bugs.	2017-07-29 19:13:42 +02:00
LevelX2	18cab46b05	* Improved editor search function, fixed some problems with search for split card rules.	2017-07-29 11:43:05 +02:00
LevelX2	1ddd063928	* Some Aftermath rule text fixes.	2017-07-29 11:40:51 +02:00
LevelX2	b9dff66fcb	* Kormus Bell - Fixed a bug with order land type changing effects are applied (fixes #3470).	2017-07-28 16:56:31 +02:00
LevelX2	ffd0c24c9c	Some minor changes.	2017-07-28 12:21:52 +02:00
ciaccona007	6e2679ed48	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-27 15:59:51 -04:00
ciaccona007	b93fe24fde	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-27 15:55:31 -04:00
LevelX2	d0e610e83b	* Afflict - Fixed that life loss of triggered afflict ability was not applied if creature with afflict was removed from battlefield before life loss effect resolved (fixes #3694).	2017-07-27 11:33:45 +02:00
LevelX2	847c6981ca	* Some rework for TargetPointer handling.	2017-07-26 17:21:03 +02:00
igoudt	96064ca5d2	clue subtype	2017-07-25 21:07:51 +02:00
igoudt	f12dc1e2b4	filter_basic_land_card added	2017-07-24 23:39:44 +02:00
igoudt	83928463a4	remove default override parameters	2017-07-24 14:42:13 +02:00
igoudt	216e269a31	use static filter for enchantment permanents	2017-07-24 14:42:13 +02:00
igoudt	c2b157d790	rewrite filter_artifact_or_enchantment_card	2017-07-24 14:42:13 +02:00
LevelX2	3f351d0def	* Clean up.	2017-07-24 00:43:20 +02:00
LevelX2	acf28d8aff	* Breath of Fury - Fixed that the enchnatment was no longer properly moved (fixes #3722).	2017-07-24 00:41:03 +02:00
LevelX2	2efc666f8d	* Some minor reworks to prevent exceptions.	2017-07-23 23:16:22 +02:00
LevelX2	b948a8255a	* Some cleanup for: Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce.	2017-07-23 22:49:56 +02:00
LevelX2	f67cd391dd	* Jandor's Ring - FIxed possible null pointer exception (discard has to be a cost still lacking).	2017-07-23 20:55:57 +02:00
LevelX2	ee59ec80e2	* Fixed a problem that the table health check removed tables that were just created by adding 30 seconds check stop after table start to prevent checking while server still is initializing the table start.	2017-07-23 20:28:18 +02:00
LevelX2	878ba90625	* Fixed a bug that prevented players from paying costs during spell resolution (e.g. Mana Leak) - (fixes #3715).	2017-07-23 19:48:04 +02:00
LevelX2	a9e2303f7e	* Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce (fixes ##3374).	2017-07-23 19:34:24 +02:00
LevelX2	cd6c7623ed	* Added missing imports, imports reorg.	2017-07-23 16:29:29 +02:00
LevelX2	4806738cfb	* Some more use of StaticFilter objects.	2017-07-23 14:59:13 +02:00
LevelX2	d5f4df7f54	* Some minor changes to return code handling.	2017-07-23 14:57:06 +02:00
LevelX2	4c33359fe2	* Some minor changes to logging and return code handling.	2017-07-23 11:06:23 +02:00
LevelX2	94be7cb4da	* Grave Betrayal - Reworked card movement and color and subtype applying.	2017-07-23 11:05:32 +02:00
Jeff	469ddcea6b	- Refactor AnnihilatorAbility().	2017-07-20 13:37:23 -05:00
Jeff	7ffcf39260	- Added requested card Volcano Hellion.	2017-07-20 11:15:58 -05:00
ciaccona007	6af45f9cff	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-19 01:43:01 -04:00
igoudt	105f346ebc	subtypes for cards 'A'	2017-07-18 08:55:40 +02:00
ciaccona007	b9f4d9523c	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-17 21:20:08 -04:00
Justin Herlehy	1daad30559	Subtype Update for "Z" Cards. ... Updated the subtypes for all implemented cards in the "Z" package. Corrected typo in the SubType enum for type BOAR. Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.	2017-07-17 17:17:07 -07:00
ciaccona007	3d24f0a0de	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 21:47:25 -04:00
ingmargoudt	09f0c9ad97	huge rework on subtypes (#3668) ... * huge rework on subtypes * update for coat of arms * fix test	2017-07-16 16:57:39 -05:00
ciaccona007	3e4809b224	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 16:38:29 -04:00
LevelX2	5774deb90c	XMAGE 1.4.24V3	2017-07-16 19:46:41 +02:00
Achilles	79be2c4ce8	- Little refactor CardsCycledOrDiscardedThisTurnWatcher	2017-07-16 12:21:28 -05:00
ciaccona007	95d0fe8802	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 13:10:43 -04:00
Achilles	5cebe20768	- Fixed bug #3656	2017-07-16 10:31:22 -05:00
LevelX2	20c8c1a9c9	* Fixed that Persist did not working with Hapatra, Vizier of Poisons and Obelisk Spider (fixes #3679).	2017-07-16 15:58:50 +02:00
igoudt	905829561e	talk to interfaces rather than implementations	2017-07-16 11:08:09 +02:00
ciaccona007	dfa4bad8c5	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-15 23:24:03 -04:00
Achilles	525a98e78a	- Fixed bug #3682	2017-07-15 15:03:13 -05:00
Achilles	11e3c9f729	- Fixed bug #3677	2017-07-15 09:20:00 -05:00
Jeff	f0d9988e9b	- Fixed bug #3656	2017-07-14 11:39:11 -05:00
Lazar	37c6d3e3f6	removed trample (#3671) ... It doesn't have trample	2017-07-12 14:18:36 -05:00
LevelX2	eb9a18c07a	* Fixed a problem that you can see the second card from top of libraray while able to cancel the cast of the top card (fixes #3196).	2017-07-12 17:05:44 +02:00
spjspj	b9f4adaf44	Merge pull request #3662 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-12 12:41:31 +10:00
spjspj	ed512d3a1d	Implement Memory Crystal (EXO)	2017-07-12 12:40:14 +10:00
spjspj	b38494a549	Merge pull request #3661 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-12 12:17:03 +10:00
spjspj	4a6b2e8db3	Implement Memory Crystal (EXO)	2017-07-12 12:16:15 +10:00
Jeff	95246e4da6	- Added Nettlevine Blight [Lorwyn]	2017-07-11 12:12:55 -05:00
Jeff	ee07a6ebc5	- Fixed issue #3519	2017-07-11 08:26:33 -05:00
spjspj	8255fb6434	Merge pull request #3654 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-11 22:31:30 +10:00
spjspj	e9a43758a8	Implement Memory Crystal (EXO)	2017-07-11 22:30:35 +10:00
igoudt	fb7b3aa7b6	added kaya subtype	2017-07-11 08:13:37 +02:00
igoudt	f2aa948c74	refactor filters to staticfilters	2017-07-11 00:18:41 +02:00
igoudt	b7159d7d2c	update spellfilters to staticfilters	2017-07-11 00:18:41 +02:00
ciaccona007	a1e7c00e21	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-10 11:44:54 -04:00
LevelX2	b50d557c75	* Ral Zarek - Reverted workaround fix and fixed the cause of the problem the untap did not work.	2017-07-10 17:17:01 +02:00
LevelX2	99a553e814	Merge origin/master	2017-07-10 17:15:16 +02:00
LevelX2	5a3243890d	Fixed that the information what mana was payed to pay the mana cost of a spell or ability were not correct if "spend mana as though" abilities were involved in the payment (fixes #3604).	2017-07-10 16:53:02 +02:00
ciaccona007	81ac455fab	Implement Festering Wound	2017-07-10 10:42:51 -04:00
igoudt	11f040b884	use more staticfilters, fix jsoncard class	2017-07-10 12:25:33 +02:00
LevelX2	75aff217da	Xmage 1.4.24V2	2017-07-09 21:09:42 +02:00
LevelX2	747c997946	* Rhonas's Stalwart - Fixed that it is incorrectly able to be blocked after exerting it.	2017-07-09 20:50:27 +02:00
LevelX2	37ffeac23d	* Instill Energy - Fixed that the enchanted creature could not attack (but should be able) the turn it came into play.	2017-07-09 15:32:52 +02:00
LevelX2	8e666c9403	Xmage 1.4.24.V1	2017-07-09 01:29:26 +02:00
LevelX2	c42841196f	Some minor fixes.	2017-07-08 23:17:41 +02:00
LevelX2	28cfbad76a	[HOU] Nimble Obstructionist - Fixed that the Cycle ability blocked the game if no valid target to counter is on the stack (fixes +3615).	2017-07-08 18:42:50 +02:00
spjspj	a4a8201ec2	Merge pull request #3613 from spjspj/master ... Minor refactor	2017-07-08 23:54:37 +10:00
LevelX2	d1f61f48f1	XMage 1.4.24V0	2017-07-08 15:54:06 +02:00
spjspj	0afaa5c59c	Minor refactor	2017-07-08 23:53:17 +10:00
igoudt	a167122459	loop to streams	2017-07-08 10:58:47 +02:00
Matthew Zulch	51595dbedf	Act of Heroism fixes (#3608) ... * Adding test case for Act of Heroism * Fixing Act of Heroism mana cost * Adding can block additional creature effect that applies to spell/ability target rather than source * Updating Act of Heroism to use new effect * Removing redundant assertion, adding some comments	2017-07-07 19:53:06 -05:00
Lazar	0792848f98	added couple lands (#3599) ... * added couple lands * moved effect to own class	2017-07-07 18:29:31 -05:00
Jeff	4d87821497	- Added Abandoned Sarcophagus. [HOU]	2017-07-07 09:23:43 -05:00
fireshoes	9284bbe6f3	Merge	2017-07-07 01:33:20 -05:00
fireshoes	160647c7cb	[HOU] Added several cards	2017-07-07 01:11:27 -05:00
emerald000	e8c1def9b0	[HOU] Added Nimble Obstructionist.	2017-07-06 23:00:37 -04:00
fireshoes	42810944f3	Commit merge	2017-07-06 21:29:21 -05:00
Justin Herlehy	53cb5ae478	Fix for Giedon of the Trials emblem. ... Resolves #3179	2017-07-06 13:01:47 -07:00
fireshoes	6286b12278	update HOU	2017-07-05 01:08:10 -05:00
LevelX2	f5c925d26c	[HOU] Added Imaginary Threats.	2017-07-05 07:58:46 +02:00
emerald000	fe95fc3b43	[HOU] Added 5 blue cards. ... Aven Reedstalker, Countervailing Winds, Cunning Survivor, Eternal of Harsh Truths and Hour of Eternity.	2017-07-04 12:57:06 -04:00
spjspj	495a84f1f1	Implement 2 cards (HOU) Fix for Bontu's Last Reckoning	2017-07-04 19:07:17 +10:00
spjspj	8e4f478946	Implement 2 cards (HOU)	2017-07-03 09:08:24 +10:00
emerald000	564e0ff70d	Fix compilation error.	2017-06-30 11:10:33 -04:00
LevelX2	c8e1a9d854	[HOU] Added 4 cards.	2017-06-29 17:55:48 +02:00
Jeff	831985a7bd	- Fixed Bug #3501	2017-06-28 16:55:24 -05:00
LevelX2	886022fd19	[HOU] Added 4 cards and some fixes.	2017-06-28 17:03:26 +02:00
emerald000	130a123052	Remove useless parameter of ExertSourceCost.	2017-06-27 23:07:24 -04:00
spjspj	5a7a9049d9	Merge pull request #3549 from spjspj/master ... Implement The Locust God (HOU)	2017-06-27 21:33:21 +10:00
spjspj	d95bd421fc	Implement The Locust God (HOU)	2017-06-27 21:16:27 +10:00
LevelX2	9b31a5a7e3	Merge pull request #3516 from ruler501/summerproject ... Shortcut/Macro System	2017-06-26 17:53:49 +02:00
spjspj	dae7530155	Merge branch 'master' into master	2017-06-26 23:16:50 +10:00
spjspj	64524a8c18	Implement The Scarab God (HOU)	2017-06-26 23:13:48 +10:00
emerald000	3388fce4c1	[HOU] Added Desert's Hold. ... Implemented OrCondition.	2017-06-26 08:26:02 -04:00
emerald000	6ee570d5e7	[HOU] Added Angel of Condemnation. ... Implemented ExertSourceCost.	2017-06-26 07:31:06 -04:00
spjspj	fc0b8ec9cb	Merge branch 'master' into master	2017-06-25 21:35:37 +10:00
spjspj	67ce816381	Implement Unesh (HOU)	2017-06-25 21:33:06 +10:00
LevelX2	f0dbc1da1c	[HOU] Added 4 black cards. Some fixes.	2017-06-25 10:21:52 +02:00
LevelX2	128b972765	[HOU] Added 5 black cards.	2017-06-24 14:00:21 +02:00
LevelX2	1210f9795a	[HOU] Added Doomfall.	2017-06-24 11:33:53 +02:00
igoudt	5bcaafd738	implemented Afflict + simple HOU cards	2017-06-24 01:13:42 +02:00
igoudt	ae640ee0b7	refactor duplicate code for playing lands from grave	2017-06-24 00:28:34 +02:00
Devon Richards	028d7ed1f8	Initial working product. Doesn't handle skipping stack.	2017-06-20 19:54:16 -05:00
igoudt	d63b241d54	implemented Eternalize Ability + Steadfast Sentinel	2017-06-19 01:03:12 +02:00
LevelX2	5cfb496899	* Storm Cauldron - Fixed that it wrongly also returned cards to hand that already left the battlefield (fixes #3487).	2017-06-11 10:44:41 +02:00
Will Hall	cdcc7449d4	Create a subtype for Samut.	2017-06-06 20:16:10 -07:00
spjspj	aabb479a40	Merge pull request #3473 from spjspj/master ... Implement Wasitora, Nekoru Queen (C17)	2017-06-07 00:42:38 +10:00
spjspj	a48d584cdd	Implement Wasitora, Nekoru Queen (C17)	2017-06-07 00:37:45 +10:00
igoudt	352637d411	Merge https://github.com/magefree/mage into text	2017-06-06 09:32:52 +02:00
igoudt	0cb7d8aab6	loop to streams	2017-06-06 09:31:41 +02:00
fireshoes	52b4633340	Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01.	2017-06-05 16:00:13 -05:00
LevelX2	0fd72c3010	* Added check if the deck was modified during sideboarding.	2017-06-05 20:23:09 +02:00
LevelX2	3c6ede7407	* Improved game is infinite loop check to ask players only if some kind of iteration is recognized.	2017-06-05 12:27:59 +02:00
igoudt	d42b2a6d37	change text for cycling to this card, rather than referring the name	2017-06-04 17:12:08 +02:00
spjspj	a371802cc0	Implement O-Kagachi, Vengeful Kami (C17)	2017-06-04 20:27:48 +10:00
LevelX2	b62a15f68e	Merge pull request #3454 from drmDev/add/welcomedeck2017 ... adding welcome deck 2017 (see #3453)	2017-06-03 10:31:49 +02:00
LevelX2	13ea2c33c6	Merge pull request #3447 from aastrand/master ... Ban ignored users from watching	2017-06-03 10:31:24 +02:00
igoudt	9ac70b868d	minor text fixes	2017-05-30 23:46:06 +02:00
Derek Monturo	1d662a0a58	adding welcome deck 2017 - closes #3453	2017-05-30 07:31:14 -04:00
Anders Åstrand	ad0507e739	Ban ignored users from watching ... This commit bans ignored users from watching games where the creator has them on their ignore list.	2017-05-29 21:36:42 +02:00
Simown	62c14a9c24	Added missed private member	2017-05-29 13:40:48 +01:00
Simown	12a520c85a	Fixed mock split card generation. Fixes #3444. ... Implementation was missing - copied it from actual split cards.	2017-05-29 13:33:50 +01:00
LevelX2	485ea2729a	Merge origin/master	2017-05-28 23:47:28 +02:00
LevelX2	884a3af503	* Norn's Annex - Fixed a bug with the payment of phyrexian mana (fixes #3178).	2017-05-28 23:45:41 +02:00
igoudt	63b69cb5db	missed some mtg subtypes	2017-05-28 22:56:27 +02:00
igoudt	d99a444389	exert can't --> won't	2017-05-28 22:56:27 +02:00
LevelX2	09e4435a89	* Fixed a problem that watcher added from cards are not reset between games of a match (fixes #3228).	2017-05-28 18:24:37 +02:00
igoudt	83c3dc05b2	forloop to stream	2017-05-28 12:24:06 +02:00
igoudt	2fc742d77d	minor typo	2017-05-28 12:23:49 +02:00
LevelX2	9c773ba3cb	* Vesuvan Shapeshifter - Fixed that copying creatures with morph and a turn face up trigger did not work correctly (fixes #2864).	2017-05-28 11:01:04 +02:00
LevelX2	d98f73518a	* Swords to Plowshares - Fixed a problem that static effects of the exiled target were still applied as the gain life effect resolved (fixes #3290).	2017-05-28 09:46:41 +02:00
LevelX2	db9e8e586b	* Cho Manno's Blessing - FIxed that it did remove itself sometimes (fixes #3382).	2017-05-28 09:11:36 +02:00
igoudt	dca676617d	fix crypt rats + added new test method	2017-05-27 09:17:08 +02:00
LevelX2	2feb764179	* Some clean up to skip handling (related to #2924).	2017-05-26 11:51:50 +02:00
LevelX2	1eb1a2abed	* Transform - Fixed that a transform effect did only resolve, if the related permanent to transform was the same as the ability was put to stack (fixes #2912).	2017-05-23 17:26:16 +02:00
LevelX2	9e78410fff	Merge branch 'master' into subtypes	2017-05-21 10:50:47 +02:00
spjspj	b467ff2080	Add emblems into the int.txt file 'emblem:Human:ElspethSunsChampionEmblem:1' for example	2017-05-21 12:42:50 +10:00
LevelX2	0b7a50e48f	* Xmage 1.4.23V6	2017-05-21 01:01:50 +02:00
LevelX2	ca9f596e4a	* Compelling Deterrance - Fixed that static effects of the card that goes to hand did not end before the discard happens (fixes #3368);	2017-05-21 00:14:06 +02:00
LevelX2	40f192eafc	* Squelch - Fixed that it was causing a ClassCastException (fixes #3396).	2017-05-20 23:22:31 +02:00
igoudt	de8737697d	complete planeswalker subtypes	2017-05-20 22:54:52 +02:00
igoudt	6d83a4a65f	finish rewriting subtypepredicate	2017-05-20 22:41:25 +02:00
igoudt	8ab4f5b454	finised all creaturetypes	2017-05-20 22:41:25 +02:00
igoudt	19db21c672	subtypes part 2	2017-05-20 22:41:25 +02:00
igoudt	c44c301f5b	subtypes #1	2017-05-20 22:41:25 +02:00
LevelX2	67a66d90da	* Hapatra, Vizier of Poisons - Fixed that it was not triggering off of Infect (fixes #3288).	2017-05-19 17:51:04 +02:00
LevelX2	e090b26240	* Urborg Justice - Fixed that tokens going to graveyard were not counted.	2017-05-18 23:42:32 +02:00
LevelX2	11ba007fd3	Xmage 1.4.23V5	2017-05-18 21:55:44 +02:00
LevelX2	d686af8890	* Fixed a problem of endless iteration with Reflecting Pool.	2017-05-18 16:57:32 +02:00
LevelX2	83cdd5570d	* Added Gangrenous Zombies and Lethal Vapor.	2017-05-18 16:57:06 +02:00
LevelX2	1d438060fc	* Fixed bug of any mana abilities not working correctly for mana abilities that could produce mana of any type other mana sources could produce.	2017-05-17 23:20:27 +02:00
LevelX2	1362637561	* Fixed bug in condition.	2017-05-16 22:48:14 +02:00
LevelX2	d284cc08b1	* Reworked some not correct working dies replacement handling.	2017-05-16 22:36:56 +02:00
LevelX2	51b075bfdb	* Reworked infinite loop handling a bit.	2017-05-16 21:13:20 +02:00
magenoxx	b3eb89c6ea	#3373: fixed exiling copied spells from stack	2017-05-16 20:18:32 +03:00
magenoxx	83ee1252cd	#3373: added exiling multiple targets in Mindbreak Trap	2017-05-16 20:17:40 +03:00
LevelX2	351095a904	* Magma Spray - Fixed a bug of dies replacement handling (#3359). Other cards with same rule text not fixed yet.	2017-05-16 17:40:04 +02:00
LevelX2	5ce813ad87	* Added a simple check for infinite loops so that if players confirm the game ends in a draw (#3329).	2017-05-16 14:45:30 +02:00
LevelX2	7dcfbd5be5	* Hexproof Planeswalkers can't be attacked (fixes #3328).	2017-05-16 10:34:58 +02:00
LevelX2	390834a0d7	* Vizier of the Menagerie - Fixed that the cards from library could be cast at instant speed (fixes #3300).	2017-05-15 16:41:47 +02:00
Ex Mage	be69510340	Fix source of PutCountersSourceCost not being set	2017-05-15 00:11:46 -04:00
Derek M	6d52ec5a59	Merge pull request #3377 from spjspj/master ... Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 12:00:58 -04:00
LevelX2	d1e4a7f6b0	Merge pull request #3372 from ingmargoudt/changelings ... change getSubtype(game).contains(..) to hasSubtype(..) to include che…	2017-05-14 06:32:48 +02:00
spjspj	f85c7e07ba	Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 13:43:18 +10:00
emerald000	d5c75cd1b3	Fixed New Perspectives to use a CostModificationEffect. ... Remove CyclingCost and WrapperCost that are now unused.	2017-05-13 18:53:35 -04:00
igoudt	265cf408f9	change getSubtype(game).contains(..) to hasSubtype(..) to include check on Changelings	2017-05-13 23:35:23 +02:00
igoudt	fc7cdcdc4e	small rewrite in the creaturesDiedWatcher	2017-05-12 22:47:35 +02:00
Derek Monturo	ae38095c58	merge	2017-05-11 12:12:20 -04:00
LevelX2	d1fd69f685	Fixed shuffle algorithm.	2017-05-09 17:01:46 +02:00
spjspj	d581fddecf	Merge pull request #3331 from spjspj/master ... Token refactor	2017-05-08 21:57:50 +10:00
spjspj	bec0964726	Token refactor	2017-05-08 21:53:01 +10:00
LevelX2	645a4ec062	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 16:24:01 +02:00
LevelX2	96d9362c55	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 14:58:14 +02:00
LevelX2	dc4283685a	* Added another StaticFilter.	2017-05-07 14:07:21 +02:00
spjspj	a897b374a0	Token refactor	2017-05-07 20:57:57 +10:00
LevelX2	757c01343f	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 10:46:01 +02:00
spjspj	a587119644	Merge pull request #3320 from spjspj/master ... Token refactor	2017-05-07 12:05:07 +10:00
spjspj	ba6e8409d1	Token refactor	2017-05-07 11:46:52 +10:00
LevelX2	f5b4c41188	* Ravnica: City of Guilds - Added 3 cards.	2017-05-06 16:05:14 +02:00
LevelX2	62947573d6	Merge origin/master	2017-05-06 15:43:34 +02:00
LevelX2	833237e09b	* Ravnica: City of Guilds - Added 5 cards.	2017-05-06 15:43:01 +02:00
spjspj	bc5e0570ed	Merge pull request #3312 from spjspj/master ... Token refactor	2017-05-06 23:42:49 +10:00
spjspj	6a610dc9d4	Token refactor	2017-05-06 23:41:18 +10:00
spjspj	e9408a7203	Merge pull request #3311 from spjspj/master ... Token refactor	2017-05-06 23:38:32 +10:00
spjspj	e73e7d8600	Token refactor	2017-05-06 23:35:14 +10:00
LevelX2	ee129e2251	* Lotus Vale - Fixed a bug that it did not working properly (fixes #3308).	2017-05-06 13:17:52 +02:00
LevelX2	afb7de2fbb	* Gitrog Monster - Fixed that triggered ability was not handled correctly after a control change (fixes #3251).	2017-05-06 11:49:49 +02:00
LevelX2	795218b030	* Roi Elemental - Fixed triggered ability that did not work correctly for copied Roi Elementals (fixes #3214).	2017-05-06 10:19:04 +02:00
igoudt	a277aafbc5	fix player damaged by source watcher	2017-05-03 16:59:45 +02:00
LevelX2	01171abad2	Merge pull request #3284 from spjspj/master ... Large Refactor - Move all tokens into Mage/src/main/java/mage/game/pe…	2017-05-03 15:40:32 +02:00
Derek M	8278b1bb2f	Merge pull request #3294 from ingmargoudt/splitcard_cmc ... fix cascade for splitcards	2017-05-03 07:51:08 -04:00
igoudt	9da97f9368	fix cascade for splitcards	2017-05-03 09:51:22 +02:00
igoudt	576ccdb34a	fix broke shadowOfTheGrave + watcher	2017-05-01 17:31:51 +02:00
spjspj	1754a69f9b	Large Refactor - Move all tokens into Mage/src/main/java/mage/game/permanent/token	2017-05-01 20:20:33 +10:00
LevelX2	97a4e9ed05	Xmage 1.4.23V4	2017-04-30 00:23:33 +02:00
igoudt	e5b9e41c1f	fix copy constructor of a watcher	2017-04-29 12:07:46 +02:00
igoudt	b6fe6f772a	finish rewriting watchers	2017-04-29 12:07:46 +02:00
igoudt	efae1251f9	first batch of watcher naming	2017-04-29 12:07:46 +02:00
spjspj	241691b153	spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:25:54 +10:00
ingmargoudt	12eb4c2fb7	Merge branch 'master' into move_magepermanent_method	2017-04-28 19:29:20 +02:00
LevelX2	33f6c629c2	* Shadow of the Grave - Some minor adjustments.	2017-04-28 11:18:26 +02:00
LevelX2	7f1da83783	Merge pull request #3261 from ingmargoudt/fix_cyclediscardwatcher ... fix for shadow of the grave	2017-04-28 11:04:24 +02:00
igoudt	6b66f8c05b	add cartouche as enchantment subtype	2017-04-28 10:23:13 +02:00
igoudt	10ecbd5adb	fix for shadow of the grave	2017-04-28 09:24:27 +02:00
igoudt	2c34870bf0	remove util function on converted manacost, make getColorIdentity default interface method	2017-04-27 10:57:48 +02:00
igoudt	7a4a0b9faa	move removeVariableManaCost from CardUtil to ManaCosts interface	2017-04-27 10:57:48 +02:00
Achilles	ba2456188f	Reverted this commit that broke a watcher. Fixes #3246	2017-04-26 07:59:16 -05:00
LevelX2	7e9d4ab515	* DreadshipReef - Fixed that the 3rd ability did not create mana (fixes #3223).	2017-04-25 23:27:24 +02:00
LevelX2	85e44017ea	Xmage 1.4.23V3	2017-04-25 22:17:22 +02:00
LevelX2	80beebccf5	* Fixed a problem of EndTurnEffect not beeing able to remove stackAbilities and endless looping as a result (fixes #3221).	2017-04-25 21:30:45 +02:00
LevelX2	24b99216f8	* Aftermath - Fixed a bug that caused problems with zone check.	2017-04-25 21:29:21 +02:00
LevelX2	60cc3a7622	* Some minor fixed and log changes.	2017-04-25 17:37:38 +02:00
LevelX2	3708ea2a89	* Added 3 cards from Ravinca City of Gold set.	2017-04-25 15:47:21 +02:00
Achilles	1607849c19	- Fixed Bug #3225	2017-04-23 20:07:40 -05:00
LevelX2	c085ea148a	* Changed some logging messages.	2017-04-23 14:11:02 +02:00
spjspj	6ab4a94bd7	spjspj - Add in 'View Current Deck' option.	2017-04-23 13:06:09 +10:00
LevelX2	900e7b29ba	XMage 1.4.23V2	2017-04-23 01:57:26 +02:00
spjspj	8845d77628	spjspj - Remove View Limited Deck option	2017-04-22 19:35:08 +10:00
spjspj	0cd4e06e22	spjspj - Add a View Limited Deck option to allow you to see your deck during matches.	2017-04-22 19:16:12 +10:00
LevelX2	a93dc4e3da	* Added a check that continuous PT setting effects are only applied, if the object has still the ability (fixes #3167). ... I added the effect now only to the layer the bug is caused by. Probably it's correct to check this for every layer. But I don't know how much resources the check addional needs. So if we got other tests that fail for this reason caused by other layers, we could add the check and test if all other tests still work correctly.	2017-04-22 00:23:37 +02:00
magenoxx	ee7026f71d	Revert "Added hashCode and equal to main server objects" ... This reverts commit 27a454f042.	2017-04-21 20:43:32 +03:00
LevelX2	e284922017	* Added Celestial Convergence and some changes to game draw handling.	2017-04-21 15:18:04 +02:00
Derek M	274e0f9052	Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire ... Implementing Guilty Conscience and Backfire	2017-04-20 20:40:03 -04:00
magenoxx	f02999910a	Merge branch 'master' of github.com:magefree/mage	2017-04-20 22:46:51 +03:00
Jeff	5f05868865	- Fixed Glyph Keeper. Bug #3180	2017-04-20 14:19:54 -05:00
magenoxx	27a454f042	Added hashCode and equal to main server objects	2017-04-20 20:06:52 +03:00
Derek M	e9d31aa93c	Merge pull request #3185 from HanClinto/CMH-FixPredicate ... Fix for "Inference variable T#1 has incompatible bounds"	2017-04-20 04:37:23 -04:00
Clint Herron	d82687bdc4	Fixing check for objects that should not untap during a specific player's next untap step ('your next untap step' vs. 'its controllers next untap step' lanugage)	2017-04-19 23:56:20 -04:00
Clint Herron	48cde05cff	Fixing additional instances where unspecified types could lead to errors	2017-04-19 22:55:48 -04:00
Clint Herron	8174f53a8c	Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work.	2017-04-19 22:31:15 -04:00
Clint Herron	30e0ef863d	Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work.	2017-04-19 22:31:02 -04:00
Clint Herron	98eea3c97b	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-19 21:49:10 -04:00