18305 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	1693dfe17d	Merge origin/master	2017-04-28 10:28:36 +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
ingmargoudt	9c14b8b999	Merge pull request #3262 from ingmargoudt/cartouche_subtype ... add cartouche as enchantment subtype	2017-04-28 10:25:13 +02:00
igoudt	6b66f8c05b	add cartouche as enchantment subtype	2017-04-28 10:23:13 +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
igoudt	7a4a0b9faa	move removeVariableManaCost from CardUtil to ManaCosts interface	2017-04-27 10:57:48 +02:00
igoudt	05785f71b9	Make the implementations of CardImageSource an enum	2017-04-27 10:57:48 +02:00
igoudt	3f47d5a253	put inputstream in try body so it can be autoclosed	2017-04-27 10:57:48 +02:00
igoudt	0528555075	make DefaulActionCallback an enum and remove unused parameter	2017-04-27 10:57:48 +02:00
igoudt	ce26e5c8dd	make the combatmanager an enum	2017-04-27 10:57:48 +02:00
igoudt	5b21f34941	rewrote gettypetext, added removeIf to TableModel	2017-04-27 10:57:48 +02:00
igoudt	27aea04820	move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription	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
Derek M	b3110af503	Merge pull request #3255 from drmDev/bug/changeMeldReminder ... removing the italics from reminder text for meld cards. might fix the…	2017-04-26 21:23:30 -04: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
Derek M	139a75eea5	Merge pull request #3254 from drmDev/master ... updated banned standard list to include felidar guardian	2017-04-26 20:56:40 -04:00
drmDev	fae65241e2	updated banned standard list to include felidar guardian	2017-04-26 20:56:10 -04:00
Derek M	6edc8457bf	Merge pull request #3253 from drmDev/master ... added comments noting tests currently failing and their associated is…	2017-04-26 20:20:58 -04:00
drmDev	abcc34432e	added comments noting tests currently failing and their associated issues	2017-04-26 20:20:26 -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	347d3bf105	Merge origin/master	2017-04-26 15:04:16 +02:00
LevelX2	837940b78d	* Added UT for #3055 - Not able to reproduce.	2017-04-26 15:03:45 +02:00
Achilles	ba2456188f	Reverted this commit that broke a watcher. Fixes #3246	2017-04-26 07:59:16 -05: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
Derek M	257a0ba433	Merge pull request #3245 from drmDev/master ... fixed UT for #3195. misinterpretted ruling. closing #3195	2017-04-26 00:05:51 -04:00
drmDev	0c16207332	fixed UT for #3195. misinterpretted ruling. closing #3195	2017-04-26 00:05:12 -04:00
Derek M	c4330415c1	Merge pull request #3241 from drmDev/master ... Unit test confirming issue #3195 with Combat Celebrant	2017-04-25 22:09:14 -04:00
drmDev	04746c5f4f	Unit test confirming issue #3195 allowing Celebrant to attack while exerted	2017-04-25 22:07:51 -04:00
ingmargoudt	a9c31cd057	Merge pull request #3240 from ingmargoudt/playertype_fix ... fix on playertype enum comparison	2017-04-26 00:38:53 +02:00
igoudt	c1ce821340	fix on playertype enum comparison	2017-04-26 00:37:06 +02:00
LevelX2	7e9d4ab515	* DreadshipReef - Fixed that the 3rd ability did not create mana (fixes #3223).	2017-04-25 23:27:24 +02:00
LevelX2	85e44017ea	Xmage 1.4.23V3	2017-04-25 22:17:22 +02:00
LevelX2	80beebccf5	* Fixed a problem of EndTurnEffect not beeing able to remove stackAbilities and endless looping as a result (fixes #3221).	2017-04-25 21:30:45 +02:00
LevelX2	24b99216f8	* Aftermath - Fixed a bug that caused problems with zone check.	2017-04-25 21:29:21 +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	9a21b55d39	Merge origin/master	2017-04-25 15:47:50 +02:00