20938 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Faxn	80923dbce0	Clean up unused imports.	2017-10-27 12:16:58 -04:00
theelk801	4012541395	Merge pull request #4127 from Zzooouhh/master ... Implemented Johan, Petra Sphinx, Teleport, Time Elemental, Vexing Arcanix, Spore Cloud, General's Regalia, Nova Pentacle, Custodi Soulcaller, Dream Tides, Misinformation and Melee	2017-10-26 22:31:56 -04:00
Faxn	df2da656d2	#4130 ... Fixing the fix to be more reasonable.	2017-10-26 19:58:10 -04:00
Zzooouhh	752f3f6741	Fug bixes	2017-10-27 01:28:32 +02:00
Zzooouhh	8f5c4a2c80	Bug fixes	2017-10-27 01:26:55 +02:00
Zzooouhh	af4cc4fc5d	Minor watcher fix	2017-10-26 23:20:34 +02:00
Zzooouhh	84f9d8e01b	Fixed effect duration	2017-10-26 23:20:03 +02:00
Zzooouhh	f3cd07af4f	Implemented Melee	2017-10-26 23:02:45 +02:00
Zzooouhh	bd84c6be54	Implemented Melee	2017-10-26 23:02:17 +02:00
Faxn	8ff6368aaf	#4130 ... Changed Decree of Justice to attach it's mana cost to the CycleTriggeredAbility instead handling the cost in the card.	2017-10-26 16:27:16 -04:00
Zzooouhh	a2ec35a616	Fixed some bug	2017-10-26 21:22:08 +02:00
Zzooouhh	e9c2c6caa1	Tiny text fix	2017-10-26 21:20:28 +02:00
Evan Kranzler	8338a788d6	fixed Derevi, Empyrial Tactician triggering while Humility is out when entering using its activated ability	2017-10-26 11:18:04 -04:00
Zzooouhh	aa49b8386f	Included watcher, changed Odric's ability to triggered ability	2017-10-26 16:18:07 +02:00
Zzooouhh	23f256c4b2	Included watcher for catching excess instances of "you choose blockers" effect	2017-10-26 16:10:59 +02:00
Zzooouhh	e3af939bd7	Included watcher for catching excess instances of "you choose blockers" effect	2017-10-26 16:09:14 +02: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	a9962e9f3b	Implemented Misinformation	2017-10-26 07:50:43 +02:00
Zzooouhh	6a9708c6f3	Implemented Misinformation	2017-10-26 00:51:08 +02:00
Zzooouhh	e32fa1cddc	Implemented Misinformation	2017-10-26 00:50:30 +02:00
Zzooouhh	7afb7eb2c5	Merge branch 'master' into master	2017-10-25 16:15:07 +02:00
Evan Kranzler	a8969b9676	small fix	2017-10-25 09:47:49 -04:00
Evan Kranzler	15764549d4	fixed Manaweft Sliver giving abilities to other player's creatures	2017-10-25 09:23:31 -04: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	5b158fc7f1	Included game.getPermanentOrLKIBattlefield in adjustTargets	2017-10-25 01:15:30 +02:00
Zzooouhh	0f45dfe4fb	Revamped targetting as adjustTargets	2017-10-25 01:13:41 +02:00
Zzooouhh	fe9ce16ed2	Reverted MeleeAbility.calculate	2017-10-25 01:10:02 +02:00
Zzooouhh	e9a0b1a5ea	Fix for Manaweft Sliver	2017-10-24 21:14:14 +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	d6f18beb90	Moved JohanVigilanceAbility	2017-10-24 17:03:21 +02:00
Zzooouhh	78e64fd909	Moved JohanVigilanceAbility	2017-10-24 17:02:32 +02:00
Zzooouhh	58ff5e017a	Moved JohanVigilanceAbility	2017-10-24 17:01:46 +02:00
Evan Kranzler	2e3c916717	fixed an incorrect commit	2017-10-24 07:39:19 -04:00
Zzooouhh	61c53bb7b8	Added missing import	2017-10-24 06:20:38 +02:00
Zzooouhh	90f2a017ab	Update MuragandaPetroglyphs.java	2017-10-24 06:19:45 +02:00
Zzooouhh	c057797906	Split off Johan's "vigilance" granting ability	2017-10-24 06:16:08 +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
Jerek Wilson	14f012dfac	Merge branch 'master' of https://github.com/jerekwilson/mage	2017-10-23 22:44:56 -04:00
Jerek Wilson	250f6ee1c1	JW-CardUpdates: Updated Rhystic Cave to announce color choice first before the decision to pay occurs. Made suggested modifications for Talon of Pain	2017-10-23 22:44:40 -04:00
Evan Kranzler	a6e066b267	Implemented Goblin Machinist	2017-10-23 22:15:08 -04:00
Evan Kranzler	2809db6bb2	Implemented Shade's Breath	2017-10-23 22:02:59 -04:00
Zzooouhh	3c0ad4368f	Implemented Dream Tides	2017-10-23 17:54:31 +02:00
Zzooouhh	ee703f8fcd	Implemented Dream Tides	2017-10-23 17:54:02 +02:00
jerekwilson	5d34a2304d	Merge branch 'master' into master	2017-10-22 20:09:26 -04:00
Jerek Wilson	8f49988bbf	JW-TalonOfPain: Implemented Talon of Pain	2017-10-22 19:37:53 -04:00
Zzooouhh	22f3000514	Implemented Custodi Soulcaller	2017-10-22 23:41:07 +02:00
Zzooouhh	0082d45877	Implemented Custodi Soulcaller	2017-10-22 23:40:35 +02:00