18722 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ingmargoudt	0879298e92	refactor cards to use supertype enum	2017-03-27 21:56:33 +02:00
ingmargoudt	84559457d3	refactor supertype to enum	2017-03-27 21:51:04 +02:00
Clint Herron	70e4752cfd	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-03-27 08:37:27 -04:00
Achilles	3a2c828fb8	- Fixed Rivals' Duel.	2017-03-26 18:25:45 -05:00
Achilles	ed37c5db8d	- Removed a test case from ReturnToHandEffectsTest that was inconsistent with the game engine. I tested the scenario and it worked fine.	2017-03-26 16:56:02 -05:00
Derek M	3d1aa304df	Merge pull request #3027 from drmDev/bug/gameofchaos ... fixes #3022 Bug/gameofchaos	2017-03-26 11:56:39 -04:00
drmDev	dcc8dc68f9	Fixes #3022 : Game of Chaos refactor and fix	2017-03-26 11:55:18 -04:00
drmDev	523703b373	merge	2017-03-26 10:33:41 -04:00
Achilles	c2bcb59c82	- Added Barrin's Spite. Fixed a targeting issue.	2017-03-25 22:41:03 -05:00
Clint Herron	402beb3b49	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-03-25 22:07:23 -04:00
Achilles	f7eab224dd	- Missed Genju of the Cedars in that last commit.	2017-03-25 18:41:25 -05:00
Achilles	26dbee6f2d	- Added BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(). Converted all the Genju cards to use it. This class is subject to rule 611.2c.	2017-03-25 17:30:14 -05:00
Achilles	0639b3b75b	- Reverted BecomesCreatureAttachedEffect(). It broke cards that are not subject to Rule 611.2c like Ensoul Artifact. A new class called BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect() will be made to fix the Genju of the Spires bug. Yes, that is a long name. If someone has a better suggestion, please let it be known.	2017-03-25 17:02:47 -05:00
Achilles	908861e56a	- Fixed Maralen of the Mornsong.	2017-03-25 14:07:14 -05:00
Achilles	ff489446fe	- Fixed BecomesCreatureAttachedEffect(). Rule 611.2c. Fixes https://github.com/magefree/mage/issues/3011	2017-03-25 13:11:08 -05:00
Clint Herron	40d318ce09	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-03-25 10:46:20 -04:00
ingmargoudt	8da4f72f8d	Merge pull request #3023 from ingmargoudt/inspecting_npe ... Inspecting npe	2017-03-25 09:45:52 +01:00
ingmargoudt	95869811ac	fixed scope issue when logging in	2017-03-25 09:38:08 +01:00
ingmargoudt	372fb4ec91	Merge branch 'master' of https://github.com/magefree/mage	2017-03-25 09:03:39 +01:00
Achilles	302f1f8262	- Fixed Goblin Grenade	2017-03-24 21:18:06 -05:00
Achilles	9702074bf5	- Fixed the Dissention set. Accidently add War's Toll.	2017-03-24 18:54:28 -05:00
Achilles	e30821b6cf	- Added Azorius AEthermage. Fixed Spellshift: The library must be shuffled.	2017-03-24 18:30:57 -05:00
Achilles	b4a60555fc	Revert "Change for id str" ... This reverts commit 1e8216c5c5.	2017-03-24 17:06:33 -05:00
Derek M	1a9c5fa469	Merge pull request #3014 from drmDev/bug/sphereCosts ... fixes #3012 manaCosts not null check and way to retrieve it	2017-03-24 08:06:30 -04:00
Derek M	420e9e2ebe	Merge pull request #3020 from drmDev/ut/halimar ... #3005 halimar tidecaller unit test. unable to duplicate issue.	2017-03-23 23:52:31 -04:00
drmDev	be62b11d2f	#3005 halimar tidecaller unit test. unable to duplicate issue.	2017-03-23 23:52:02 -04:00
Derek M	aab2eb88f6	Merge pull request #3019 from drmDev/ut/dec-stone ... #3017 unit tests for declaration in stone. cannot duplicate issue	2017-03-23 23:38:35 -04:00
drmDev	94c8d7f387	#3017 unit tests for declaration in stone. cannot duplicate issue	2017-03-23 23:38:03 -04:00
Clint Herron	bce7e690a8	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-03-23 19:26:34 -04:00
Clint Herron	3c81275ab1	Implementing Guilty Conscience and Backfire, as well as expanding capabilities of trigers that occur when an enchanted creature deals damage to a player, and adding an effect to deal damage to an enchanted creature.	2017-03-23 19:23:28 -04:00
Derek M	25752f913e	Merge pull request #3013 from ingmargoudt/remove_usermap_by_name ... remove usermap by name, introduced more optionals	2017-03-23 19:16:57 -04:00
spjspj	c7189a3354	Merge pull request #3016 from spjspj/master ... Change for id str	2017-03-24 08:15:17 +11:00
spjspj	1e8216c5c5	Change for id str	2017-03-24 08:14:17 +11:00
Achilles	8bcb2d1d2d	- Added Quicksilver Fountain	2017-03-23 15:13:13 -05:00
Derek M	f3ff01fcdf	Merge pull request #3015 from drmDev/bug/tokens-exile-end-combat ... fixing tokens exiled at end of combat - not at end step	2017-03-23 11:24:06 -04:00
drmDev	57efb10003	fixing tokens exiled at end of combat - not at end step	2017-03-23 11:21:38 -04:00
drmDev	097d60f5fc	fixes #3012 manaCosts not null check and way to retrieve it	2017-03-23 10:25:21 -04:00
ingmargoudt	746fed4032	Merge pull request #3006 from ingmargoudt/phantoms ... phantom effect code duplication	2017-03-23 13:43:49 +01:00
ingmargoudt	5ae4ddce07	Merge branch 'master' into phantoms	2017-03-23 13:43:34 +01:00
Derek M	cf831eea28	Merge pull request #3007 from kubikrubikvkube/master ... Enums should be compared with == but not equals()	2017-03-22 16:17:07 -04:00
Derek M	9c3aab3284	Merge pull request #3009 from Alexsandr0x/Citadel-of-Pain ... Citadel of Pain	2017-03-22 16:16:21 -04:00
ingmargoudt	334ad729a8	remove usermap by name, introduced more optionals	2017-03-22 20:49:48 +01:00
Alexsandro	0d0bba7f57	Fiz turns to pass in unit test	2017-03-22 13:14:15 -03:00
Alexsandro	bfb2b07ba6	Create unit tests	2017-03-22 13:09:49 -03:00
spjspj	ddd226e60c	Merge pull request #3008 from spjspj/master ... spjspj - Add Chronomantic Escape (FUT)	2017-03-23 00:45:35 +11:00
spjspj	d947a8d75b	spjspj - Add Chronomantic Escape (FUT)	2017-03-23 00:44:03 +11:00
vraskulin	d3214c65e4	Merge remote-tracking branch 'fork/master'	2017-03-22 14:51:31 +03:00
vraskulin	d93061c0bc	Equals should be compared with == but not equals()	2017-03-22 14:50:50 +03:00
ingmargoudt	b154bf58f9	phantom effect code duplication	2017-03-22 10:25:57 +01:00
ingmargoudt	bfd337a808	Merge branch 'master' of https://github.com/magefree/mage	2017-03-22 09:05:44 +01:00