16295 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
LevelX2	8b62eece68	XMage 1.4.17V0	2016-10-23 10:03:01 +02:00
LevelX2	b2bd7f5e24	Merge origin/master	2016-10-23 00:38:37 +02:00
LevelX2	976936b55d	* Phyrexian Metamorph - Fixed that the enteres battlefield effect was not optional.	2016-10-23 00:38:14 +02:00
LevelX2	c7744d8631	* Fixed a bug with tokens using the optional EntersBattlefieldEffect (e.g. Clone with Mimic Vat).	2016-10-23 00:36:36 +02:00
LevelX2	f48e20a48c	Fixed a rule text problem of PhaseOutTargetEffect.	2016-10-23 00:08:41 +02:00
LevelX2	a3a2deb214	Merge pull request #2494 from cg5-/ixidor ... Add Ixidor, Reality Sculptor	2016-10-22 23:27:26 +02:00
cg5	f0034988fa	Fix text	2016-10-22 22:27:58 +02:00
cg5	56c866ea4b	Add Ixidor, Reality Sculptor	2016-10-22 22:16:23 +02:00
spjspj	08b2708f3d	Merge pull request #2493 from spjspj/master ... Add confirmation dialog to server.console	2016-10-23 01:45:38 +11:00
spjspj	d53fe3ae52	Add confirmation dialog to server.console	2016-10-23 01:44:34 +11:00
fireshoes	856802d861	Merge origin/master	2016-10-22 08:27:01 -05:00
fireshoes	ac63080f7e	Added Noose Constrictor FNM promo. Minor text fix.	2016-10-22 08:26:09 -05:00
LevelX2	07a7afa285	Added test and fixed some possible null pointer exception.	2016-10-22 13:06:41 +02:00
LevelX2	bf43ea9936	Added test and fixed some possible null pointer exception.	2016-10-22 12:45:50 +02:00
LevelX2	13c8f3263f	* Glint-Next Crane - Fixed that it was not optional to reveal an artifact (fixes #2491).	2016-10-22 11:14:47 +02:00
LevelX2	97b872d926	* Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes).	2016-10-22 10:38:10 +02:00
LevelX2	da4e0bc20e	Merge origin/master	2016-10-21 17:10:39 +02:00
LevelX2	34b8f7add9	Merge pull request #2489 from ZNixian/master ... Improve keybinds	2016-10-21 12:57:56 +02:00
LevelX2	ee96531de5	* Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes).	2016-10-21 00:15:41 +02:00
LevelX2	72b23acf23	* Prized Amalgam - Fixed a problem with Prized Amalgam.	2016-10-21 00:13:32 +02:00
Campbell Suter	0428f5bab3	Add reset keys to default button	2016-10-21 09:54:09 +13:00
Campbell Suter	4c292466c1	Make it impossible to have multiple actions bound to the same key.	2016-10-21 09:54:09 +13:00
LevelX2	4d0660b19f	* Doubling Season - Fixed that tokens were not doubled because they were put onto the battlefield on Doubling Seasons controller's side but wrongly only if Doubling Seasons controller did controll the effect that put the tokens onto the battlefield.	2016-10-20 22:50:29 +02:00
LevelX2	468eb46471	* Midnight Oil - Fixed that also one remaning counter was removed it from it's own effect.	2016-10-20 19:45:04 +02:00
spjspj	b428117252	Merge pull request #2486 from spjspj/master ... spjspj - Update all TargetOpponentsChoicePermanent cards with whether…	2016-10-21 00:29:49 +11:00
spjspj	712f19f4e6	spjspj - Update all TargetOpponentsChoicePermanent cards with whether they have to target an opponent. (There was a NPE when an opponent had hexproof)	2016-10-21 00:28:41 +11:00
LevelX2	89a739e902	* Removed debug messages.	2016-10-20 15:16:31 +02:00
LevelX2	77729e892c	* Prized Amalgam - Fixed that it also returned if it entered and left the battlefield after the trigger was created (fixes #2485).	2016-10-20 15:04:27 +02:00
spjspj	4732f83082	Merge pull request #2484 from spjspj/master ... spjspj - Fix Evangelize (TSP)	2016-10-20 18:51:58 +11:00
spjspj	7017749265	spjspj - Fix Evangelize (TSP)	2016-10-20 18:50:36 +11:00
spjspj	37f30f3899	Merge pull request #2483 from spjspj/master ... spjspj - Add Evangelize (TSP) - Also possibly a fix for Preacher whic…	2016-10-20 16:59:56 +11:00
spjspj	b6661ae79d	spjspj - Add Evangelize (TSP) - Also possibly a fix for Preacher which could target Narset, Enlightened Master when it shouldn't be able to	2016-10-20 16:58:18 +11:00
LevelX2	c82ce99325	Merge pull request #2482 from ZNixian/master ... Allows custom binding of keys in game mode	2016-10-20 07:28:09 +02:00
Campbell Suter	cde9afa091	Make keybound buttons cache their text, in case the keys are changed midgame	2016-10-20 12:49:58 +13:00
Campbell Suter	b4dc47fbc9	Improve keybinding buttons, add information	2016-10-20 12:36:18 +13:00
Campbell Suter	5ea636126f	Make the text on the playing buttons update with the current keybinds	2016-10-20 12:36:18 +13:00
Campbell Suter	d9ebceec20	Make tooltips work properly	2016-10-20 12:36:18 +13:00
Campbell Suter	e910778e54	Add F2/F6, use bindings in game	2016-10-20 12:36:18 +13:00
Campbell Suter	d7a3904569	Add key options to prefs dialog	2016-10-20 12:36:18 +13:00
LevelX2	ae2765885f	Merge pull request #2474 from nigelzor/verify-card-data ... Add tests that compare card data with mtgjson	2016-10-20 00:19:06 +02:00
LevelX2	6d099312df	[SWS] Dark Decision - Fixed that the exiled card could not be cast.	2016-10-19 23:58:07 +02:00
LevelX2	aa5ab9ea18	[SWS] Force Adept - Fixed missing targets.	2016-10-19 23:51:18 +02:00
LevelX2	5882b50898	[SWS] Cloaking Device - fixed that defending player did not lose life.	2016-10-19 23:47:56 +02:00
LevelX2	5242eff182	[SWS] Fixed wrong casting costs of Gungan Captain.	2016-10-19 23:38:02 +02:00
LevelX2	cfb4eea267	[SWS] Fixed wrong p/t of Trade Federation Battleship.	2016-10-19 23:35:51 +02:00
LevelX2	a47aa158f0	[SWS] Fixed a bug of the watcher used for the hate ability.	2016-10-19 23:31:53 +02:00
LevelX2	54d5599e06	[SWS] Fixed Exogorth's block ability.	2016-10-19 23:24:02 +02:00
emerald000	99fa296e37	Added Flux and Withdraw.	2016-10-18 23:14:07 -04:00
fireshoes	3f0a97a778	Fixed cube name.	2016-10-18 19:29:18 -05:00
fireshoes	a13dc33342	Fixed cube name.	2016-10-18 19:27:25 -05:00