10984 commits

Author	SHA1	Message	Date
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	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
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
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
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
igoudt	566966bf6b	fix and test for triumph of the hordes	2017-05-03 11:02:23 +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
bugfi5h	d43aefa5e3	removed unused imports	2017-05-01 18:27:45 +02:00
bugfi5h	a1dba938a4	Added Card: Entangler	2017-05-01 18:24:10 +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
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
Dustin Ryan - Roepsch	db608dc35d	optimized imports	2017-04-30 16:15:24 -05:00
Dustin Ryan - Roepsch	8aee5d795c	Implemented Heat Stroke	2017-04-30 16:14:39 -05:00
Dustin Ryan - Roepsch	3b82e3c2bf	Generated card template using pearl script	2017-04-30 15:31:06 -05:00
ingmargoudt	f0a83c4689	Merge pull request #3281 from ingmargoudt/gatherer_of_graces ... Implemented Gatherer of Graces from Guildpact	2017-04-30 19:00:34 +02:00
igoudt	a1f2c742be	Implemented Gatherer of Graces from Guildpact	2017-04-30 18:59:08 +02:00
Derek M	5bfd84f6ac	Merge pull request #3280 from ingmargoudt/quicksilver_fountain ... fix for quicksilver fountain, as it let you target all lands in play …	2017-04-30 12:47:22 -04:00
igoudt	01813cce0c	fix for quicksilver fountain, as it let you target all lands in play instead of your own	2017-04-30 17:45:23 +02:00
ingmargoudt	bffc04a49e	Merge pull request #3277 from ingmargoudt/kyren_negotiations ... implemented Kyran Negatiations from Mercadian Masques	2017-04-30 15:08:01 +02:00
igoudt	8512e3043d	implemented Kyran Negatiations from Mercadian Masques	2017-04-30 15:05:21 +02:00
igoudt	801aa98430	remove imports	2017-04-30 10:27:43 +02:00
igoudt	f9a5bc59c3	fix for gate to the afterlife	2017-04-30 10:26:47 +02:00
igoudt	b6fe6f772a	finish rewriting watchers	2017-04-29 12:07:46 +02:00
igoudt	efae1251f9	first batch of watcher naming	2017-04-29 12:07:46 +02:00
igoudt	20a881a374	make the condition in cards an enum	2017-04-29 12:01:49 +02:00
igoudt	3e5ff8ccb2	rewrites to getOrDefault	2017-04-29 12:01:49 +02:00
igoudt	f69ff3aca9	rewrote InfernoTrap	2017-04-29 12:01:49 +02:00
ingmargoudt	12eb4c2fb7	Merge branch 'master' into move_magepermanent_method	2017-04-28 19:29:20 +02:00
LevelX2	26e81ab26d	* Added UT for #3251.	2017-04-28 15:41:38 +02:00
LevelX2	47de4cac6b	* Squandered Resources - Fixed that the ability was no mana ability (fixes #3259).	2017-04-28 14:25:04 +02:00
LevelX2	236608cd0f	* Approach Of The Second Sun - Fixed that it did not always correctly determined if a player has won (fixes #3250).	2017-04-28 14:18:58 +02:00
LevelX2	33f6c629c2	* Shadow of the Grave - Some minor adjustments.	2017-04-28 11:18:26 +02:00
LevelX2	7f1da83783	Merge pull request #3261 from ingmargoudt/fix_cyclediscardwatcher ... fix for shadow of the grave	2017-04-28 11:04:24 +02:00
LevelX2	108f3faaa8	* Natural Balance - Some minor changes.	2017-04-28 10:56:44 +02:00
LevelX2	468440cb71	Merge pull request #3248 from bugfi5h/master ... Added Card: Natural Balance	2017-04-28 10:35:12 +02:00
LevelX2	3cc3d430ea	* Bontu the Glorified - Fixed that it was possible to sacrifice non creature permanents.	2017-04-28 10:26:51 +02:00
igoudt	10ecbd5adb	fix for shadow of the grave	2017-04-28 09:24:27 +02:00
bugfi5h	217e294470	Added Card: Copper-Leaf Angel	2017-04-27 21:25:30 +02:00
igoudt	2c34870bf0	remove util function on converted manacost, make getColorIdentity default interface method	2017-04-27 10:57:48 +02:00
igoudt	8a80976171	have Flash and Tariff use the moved removeVariableManaCost method	2017-04-27 10:57:48 +02:00
bugfi5h	33f2f3e9fc	Merge branch 'master' of https://github.com/magefree/mage	2017-04-27 06:51:17 +02:00
bugfi5h	59a790e320	Using getPlayersInRange instead of getPlayersList	2017-04-27 06:33:35 +02:00
drmDev	43a001dcdd	removing the italics from reminder text for meld cards. might fix the issue in #3129	2017-04-26 21:22:22 -04:00
bugfi5h	f20496e40f	Auto indent class	2017-04-26 23:11:46 +02:00
bugfi5h	4a8af2b4d2	Merge origin/master	2017-04-26 19:44:24 +02:00
bugfi5h	e2f960c8fd	Added Card: Natural Balance	2017-04-26 19:41:18 +02:00
LevelX2	86bc78e4b8	* Nest of Scarabs - Fixed that it does not produce tokens when -1/-1 counters are placed on creatures.	2017-04-26 14:36:52 +02:00
LevelX2	bb4714eb32	Merge origin/master	2017-04-25 19:08:25 +02:00
LevelX2	3f12e1690b	* Added 3 cards from Ravinca City of Guilds set.	2017-04-25 19:08:06 +02:00
LevelX2	60cc3a7622	* Some minor fixed and log changes.	2017-04-25 17:37:38 +02:00
LevelX2	3708ea2a89	* Added 3 cards from Ravinca City of Gold set.	2017-04-25 15:47:21 +02:00
LevelX2	d99fe5a70e	* Fixed Mimeoplasm allows choosing same creature twice (fixes #3230).	2017-04-25 09:49:43 +02:00
Jeff	7479cd5668	- Fixed Orator of Ojutai. Intervening If clause.	2017-04-24 09:25:27 -05:00
drmDev	ec6f19f41f	fixes #3226 wirefly tokens have flying	2017-04-23 19:48:04 -04:00
Achilles	747c76519e	- Fixed filter Commit/Memory	2017-04-23 14:03:12 -05:00
fireshoes	4e1572bc62	Added missing Amonkhet Invocations.	2017-04-23 11:20:17 -05:00
LevelX2	ceb7dbcdf2	* Vizier of Remedies - Fixed a possible null pointer exception.	2017-04-23 14:10:27 +02:00
Achilles	74dd2878ed	- Fixed Decimator Beetle. Bug #3212	2017-04-22 14:35:38 -05:00
LevelX2	a93dc4e3da	* Added a check that continuous PT setting effects are only applied, if the object has still the ability (fixes #3167). ... I added the effect now only to the layer the bug is caused by. Probably it's correct to check this for every layer. But I don't know how much resources the check addional needs. So if we got other tests that fail for this reason caused by other layers, we could add the check and test if all other tests still work correctly.	2017-04-22 00:23:37 +02:00
LevelX2	5d2c210d36	* Added Celestial Convergence and some changes to game draw handling.	2017-04-21 15:27:22 +02:00
LevelX2	e284922017	* Added Celestial Convergence and some changes to game draw handling.	2017-04-21 15:18:04 +02:00
Derek M	274e0f9052	Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire ... Implementing Guilty Conscience and Backfire	2017-04-20 20:40:03 -04:00
Clint Herron	523743aaf6	Fixing nits from LevelX2 -- adding authorship tag and marking both enchantments as unboost effects, because both are things that you would tend to want to play on your opponents' creatures -- not your own. This should help the AI make more sensible plays when using these.	2017-04-20 19:03:05 -04:00
Jeff	5f05868865	- Fixed Glyph Keeper. Bug #3180	2017-04-20 14:19:54 -05:00
fireshoes	a86a1ebf5f	Added Iconic Masters to known-sets/mtg-sets-data.txt	2017-04-20 10:37:16 -05:00
Jeff	cb3f0b2a51	- Fixed Cruel Reality and Sigarda, Host of Herons interaction.	2017-04-20 08:44:49 -05:00
Clint Herron	f461899eec	Changing description to match 'enchanted creature' properly now so that Backfire now has the correct reminder text.	2017-04-19 22:18:49 -04:00
Clint Herron	98eea3c97b	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-19 21:49:10 -04:00
Jeff	c5b3975700	- Changed == to equals().	2017-04-19 15:05:23 -05:00
Jeff	10a043f19b	- Fixed Soul-Scar Mage. Bug #3163	2017-04-19 11:02:27 -05:00
LevelX2	04c80c27a3	* Fixed Binding Mummy's ability doesn't trigger from Liliana, Death Majesty -3 ability (fixes #3165).	2017-04-19 16:40:00 +02:00
ingmargoudt	58b1c4c0c8	small fix on color	2017-04-19 12:15:36 +02:00
fireshoes	e5e614c341	[AKH] Added common tapland cycle shown in the Gatherer	2017-04-18 19:07:03 -05:00
LevelX2	01153965c4	* Mimic Vat - Fixed possible null pointer exception.	2017-04-19 00:07:34 +02:00
LevelX2	d7671bf0b1	* Time to Reflect - Fixed possible null pointer exception.	2017-04-18 23:59:06 +02:00
LevelX2	e475ad9df7	* Abeyance - Fixed possible null pointer exception.	2017-04-18 23:36:06 +02:00
Jeff	cf90bb4d36	- Text change for Approach of the Second Sun.	2017-04-18 15:44:41 -05:00
Jeff	625efd8150	- Fixed Approach of the Second Sun. Bug #3122	2017-04-18 15:34:05 -05:00
Jeff	6a55c87eef	- Fixed Cruel Reality. Bug #3162	2017-04-18 15:12:08 -05:00
Clint Herron	4a13ba3645	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-18 15:18:30 -04:00
Jeff	9e1acd5daa	- Fixed Hapatra, Vizier of Poisons. Bug #3157	2017-04-18 12:08:15 -05:00
fireshoes	2c9c4888cc	Added Commander 2017 to known sets.	2017-04-18 11:39:47 -05:00
Clint Herron	d1c8796a49	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-18 11:00:24 -04:00
Jeff	aa4cf21b13	- Fixed Scarab Feast.	2017-04-18 07:58:25 -05:00
LevelX2	1e06c9d2e3	* Rhonas's Monument - Fixed wrong target definition (fixes #3150).	2017-04-18 07:35:19 +02:00
fireshoes	cc57c2fad9	[AKH] Fixed Oracle's Vault missing 'play without paying its mana cost' ability	2017-04-17 21:12:30 -05:00
Jeff	1869d97dbc	- Fixed Plague Belcher.	2017-04-17 15:59:03 -05:00