20762 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
spjspj	c11a89a90a	Merge pull request #3347 from spjspj/master ... Fix for Martyr's Bond	2017-05-11 16:14:50 +10:00
spjspj	43d0b5f3b2	Fix for Martyr's Bond	2017-05-11 16:09:40 +10:00
Derek M	085137d60a	Merge pull request #3344 from drmDev/ut/martyr-bond ... minor edit	2017-05-10 15:45:36 -04:00
Derek Monturo	b196f06b1c	minor edit	2017-05-10 15:44:39 -04:00
Derek M	de6634b703	Merge pull request #3343 from drmDev/ut/martyr-bond ... UT duplicating bug in #3332 martyr bond	2017-05-10 15:44:15 -04:00
Derek Monturo	88108e03c3	UT duplicating bug in #3332 martyr bond	2017-05-10 15:43:47 -04:00
Derek M	0aa9cd47ac	Merge pull request #3342 from drmDev/ut/priv-pos ... UT for #3328 unable to duplicate issue with priv position	2017-05-10 15:09:08 -04:00
Derek Monturo	5fb08958f2	UT for #3328 unable to duplicate issue with priv position	2017-05-10 15:08:36 -04:00
LevelX2	ea439505ce	Some minor changes.	2017-05-09 17:02:30 +02:00
LevelX2	d1fd69f685	Fixed shuffle algorithm.	2017-05-09 17:01:46 +02:00
LevelX2	c731a10360	Added a unit test.	2017-05-09 17:01:20 +02:00
spjspj	64e7b7d1ef	Merge pull request #3333 from spjspj/master ... Token Refactor	2017-05-09 00:19:34 +10:00
spjspj	0942db541f	Token refactor	2017-05-08 23:26:33 +10:00
spjspj	f909005bb1	Token refactor	2017-05-08 23:20:33 +10: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
Simown	c393fbcc1f	Added unit test for changeling issue #3316 ... - Is not a bug with Kaseto rather the changeling being a snake creature	2017-05-06 21:14:40 +01:00
Derek M	0e76c2a225	Merge pull request #3317 from drmDev/ut/hapatra ... added UTs for Hapatra bug #3288	2017-05-06 13:49:58 -04:00
Derek Monturo	be1f4acac5	added UTs for Hapatra bug #3288	2017-05-06 13:49:15 -04: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
Simown	9ae0c31ee1	Updated failing Gitrog Monster test description	2017-05-05 23:54:12 +01:00
Simown	da3a3ec875	Attacker/blocker indexing fix - updated TestPlayer and unit tests	2017-05-05 23:53:58 +01:00
ingmargoudt	355394e90b	Merge pull request #3305 from Scott-Crawford/master ... Restoring Starter1999	2017-05-05 16:07:46 +02:00
Scott Crawford	83f6b142ff	Removing minuses	2017-05-04 08:48:03 -07:00
Scott Crawford	a0738ae59d	Restoring Starter1999 ... Fixing accidental deletion from previous commit	2017-05-04 08:09:27 -07:00
LevelX2	2832cb9335	* Some minor changes to Misfortune's Gain and Path of Peace.	2017-05-04 10:26:34 +02:00
LevelX2	418bf2f569	Merge pull request #3303 from Scott-Crawford/master ... Implemented Misfortune's Gain and Path of Peace	2017-05-04 10:21:22 +02:00
Scott Crawford	d5c5b0cdb9	fixed spacing	2017-05-03 19:43:23 -07:00
Scott Crawford	f88876d137	Misfortune's Gain ... implemented misfortune's gain	2017-05-03 19:41:10 -07:00
Scott Crawford	61e3166492	Path of Peace ... implemented Path of Peace	2017-05-03 19:37:41 -07:00
Scott Crawford	b2db8057b5	New cards ... Generated Misfortune's Gain and Path of Peace	2017-05-03 19:37:18 -07:00
ingmargoudt	a532368b84	Merge pull request #3298 from ingmargoudt/fix-watcher ... fix player damaged by source watcher	2017-05-03 17:02:21 +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