18237 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Derek M	54f4467790	Merge pull request #3276 from ingmargoudt/gatetotheafterlife ... Gatetotheafterlife	2017-04-30 08:56:36 -04: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
spjspj	3f125db074	Merge pull request #3271 from spjspj/master ... spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…	2017-04-30 11:15:54 +10:00
spjspj	0d0fccc105	spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first.	2017-04-30 11:14:24 +10:00
LevelX2	97a4e9ed05	Xmage 1.4.23V4	2017-04-30 00:23:33 +02:00
LevelX2	3cc157bc2c	* Fixed null pointer exception problems in client.	2017-04-30 00:07:37 +02:00
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