18222 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
LevelX2	4d60685c05	* Fixed handling of standard set rotation(fixes #3260).	2017-04-29 23:18:36 +02:00
LevelX2	ab352a3c6b	* Fixed handling of standard set rotation(fixes #3260).	2017-04-29 23:17:52 +02:00
LevelX2	be03cf7a8f	Merge pull request #3267 from ingmargoudt/random_cleanups ... Random cleanups	2017-04-29 17:34:19 +02:00
igoudt	e5b9e41c1f	fix copy constructor of a watcher	2017-04-29 12:07:46 +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
spjspj	1d3d60370f	Merge pull request #3266 from spjspj/master ... spjspj - Add in Tokens to the Card Viewer (fix)	2017-04-29 17:42:44 +10:00
spjspj	04f298923c	spjspj - Add in Tokens to the Card Viewer (fix)	2017-04-29 17:42:08 +10:00
spjspj	c501f885d1	Merge pull request #3265 from spjspj/master ... spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:27:52 +10:00
spjspj	241691b153	spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:25:54 +10:00
ingmargoudt	5afdc78f5b	Merge pull request #3264 from ingmargoudt/fix_compilation ... remove sun reference	2017-04-29 08:40:17 +02:00
igoudt	9ca9975cb0	remove sun reference	2017-04-29 08:39:26 +02:00
LevelX2	2d427861f1	Merge pull request #3256 from ingmargoudt/move_magepermanent_method ... Move magepermanent method	2017-04-28 22:34:08 +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	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
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