18289 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
spjspj	43d0b5f3b2	Fix for Martyr's Bond	2017-05-11 16:09:40 +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	bec0964726	Token refactor	2017-05-08 21:53:01 +10:00
spjspj	a897b374a0	Token refactor	2017-05-07 20:57:57 +10:00
spjspj	ba6e8409d1	Token refactor	2017-05-07 11:46:52 +10: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
LevelX2	e862e7c5b5	Merge origin/master	2017-05-03 14:59:47 +02:00
LevelX2	e73a2f5c58	* Nest of Scarabs - Fixed that did not produce tokens when -1/-1 counters are placed on creatures. (fixes #3174).	2017-05-03 14:59:21 +02:00
Derek M	03237aa2fe	Merge pull request #3295 from ingmargoudt/triumph_hordes_unittest ... Triumph hordes unittest	2017-05-03 07:53:47 -04: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	566966bf6b	fix and test for triumph of the hordes	2017-05-03 11:02:23 +02:00
igoudt	9da97f9368	fix cascade for splitcards	2017-05-03 09:51:22 +02:00
LevelX2	69ac72e242	Merge origin/master	2017-05-03 09:30:05 +02:00
LevelX2	c46a292d14	* Added missing card entry of Celestial Gatekeeper to Prophecy set.	2017-05-03 09:29:44 +02:00
Derek M	bf45c461e5	Merge pull request #3289 from drmDev/master ... UT for nest of scarabs issue, replicating bug #3174	2017-05-01 22:34:47 -04:00
Derek Monturo	7b245668f7	UT for nest of scarabs issue, replicating bug #3174	2017-05-01 22:34:11 -04:00
Derek M	d0e0310f35	Merge pull request #3287 from bugfi5h/master ... Added Cards: Entangler and Copper-Leaf Angel	2017-05-01 14:53:16 -04:00
bugfi5h	d43aefa5e3	removed unused imports	2017-05-01 18:27:45 +02:00
bugfi5h	149ff4846f	Merge branch 'develop'	2017-05-01 18:25:13 +02:00
bugfi5h	0413317862	Merge branch 'feature/CopperAngel' into develop	2017-05-01 18:24:31 +02:00
bugfi5h	a1dba938a4	Added Card: Entangler	2017-05-01 18:24:10 +02:00
ingmargoudt	bc9fb090ae	Merge pull request #3285 from ingmargoudt/cleanup ... fix broke shadowOfTheGrave + watcher	2017-05-01 17:36:14 +02:00
igoudt	576ccdb34a	fix broke shadowOfTheGrave + watcher	2017-05-01 17:31:51 +02:00
bugfi5h	72ec960c95	Merge branch 'develop' into feature/CopperAngel	2017-05-01 15:10:56 +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	0ccd606ba7	Merge pull request #3282 from dustinroepsch/add-heat-stroke ... Add Card: Heat Stroke	2017-05-01 10:28:04 +02:00
Dustin Ryan - Roepsch	4c7ab8babe	removed extra line	2017-04-30 17:56:08 -05:00
Dustin Ryan - Roepsch	640f1bea5b	Fixed card text	2017-04-30 17:53:12 -05:00
Dustin Ryan - Roepsch	c6f4332f2e	fixed static text	2017-04-30 17:29:39 -05:00