18188 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Achilles	1f9b51d833	- Added Noetic Scales	2017-03-21 21:37:11 -05:00
Achilles	1fc245eb10	- Set edit needed for Keldon Firebombers	2017-03-21 20:44:04 -05:00
Achilles	cdef5fb13b	- Added Keldon Firebombers	2017-03-21 20:40:10 -05:00
Derek M	91536469ee	Merge pull request #3003 from drmDev/refactor/tokens-exiled ... Refactor/tokens exiled	2017-03-21 19:59:18 -04:00
drmDev	107b83c231	fixes tapped and attacking cards. reverted firecat blitz. created issue for that one	2017-03-21 19:57:49 -04:00
LevelX2	4b8c2d19ad	Added Ogre Leadfoot.	2017-03-21 19:57:49 -04:00
Max Lebedev	338d032a8b	updated author	2017-03-21 19:57:49 -04:00
Max Lebedev	2f031f883c	added Divining Witch	2017-03-21 19:57:49 -04:00
ingmargoudt	59eb2ed568	change map for list	2017-03-21 19:57:49 -04:00
LevelX2	7549bf6d28	Merge pull request #2999 from ingmargoudt/kynaios-rewrite ... change map for list	2017-03-21 11:43:41 +01:00
LevelX2	7693f3fd59	Added Ogre Leadfoot.	2017-03-21 11:37:22 +01:00
LevelX2	0a45985ad6	Merge pull request #3000 from maxlebedev/master ... Added Divining Witch	2017-03-21 11:08:25 +01:00
Max Lebedev	f6e6d806e0	updated author	2017-03-21 02:30:33 -04:00
Max Lebedev	462d2db8ff	added Divining Witch	2017-03-21 02:24:38 -04:00
drmDev	5c34022175	second set using refactored createtokeneffect for exiling at end step	2017-03-20 21:57:26 -04:00
drmDev	a8f42de901	First set of cards updated to simplifed token creation and exile at end step	2017-03-20 21:30:48 -04:00
LevelX2	696272b328	* Misthollow Griffin - Fixed a bug that sometimes a not owning player could play the card from exile.	2017-03-20 23:09:14 +01:00
Alexsandro	a6e1c1a37d	Add ability to cast	2017-03-20 19:03:12 -03:00
Alexsandro	096efc8951	Implement Citadel of Pain	2017-03-20 18:55:49 -03:00
Achilles	dc7e9318af	- getPlayersInRange() added to All Hallow's Eve	2017-03-20 08:24:28 -05:00
vraskulin	c783614cba	NotifyAll	2017-03-20 15:17:30 +03:00
vraskulin	f37c823aa8	String + string concatenation can be replaced by string + char concetenation	2017-03-20 14:00:18 +03:00
ingmargoudt	7e75b0cc03	change map for list	2017-03-20 10:39:59 +01:00
ingmargoudt	992954eb12	Merge branch 'master' of https://github.com/magefree/mage	2017-03-20 10:06:53 +01:00
ingmargoudt	0cb8e727fb	Merge pull request #2998 from kubikrubikvkube/master	2017-03-20 09:43:01 +01:00
vraskulin	1fa9d4a4f6	Typo	2017-03-20 11:34:44 +03:00
Derek M	6cab4db51f	Merge pull request #2996 from drmDev/ut/tromokratis ... #2995 unable to duplicate by unit tests	2017-03-19 22:10:09 -04:00
drmDev	fb37dcd5f1	#2995 unable to duplicate by unit tests	2017-03-19 22:09:29 -04:00
Achilles	49974c5d66	- Added All Hallow's Eve.	2017-03-19 18:47:20 -05:00
LevelX2	bc81f7974a	Merge pull request #2992 from ingmargoudt/optionals ... rewrites to optionals	2017-03-19 23:27:09 +01:00
Derek M	70f22fefd4	Merge pull request #2991 from drmDev/card/lightcoils ... Implemented card Lightning Coils and test for it	2017-03-19 17:56:22 -04:00
drmDev	311e41abd2	refactored exiletokensAtEndStep	2017-03-19 17:54:07 -04:00
ingmargoudt	ff6c6405aa	rewrites to optionals	2017-03-19 19:48:32 +01:00
drmDev	dcd5c76bad	minor typo fix	2017-03-19 12:33:12 -04:00