21586 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
LevelX2	6d17199129	* Toxin Sliver - Fixed that the damaged creature was not destroyed.	2017-12-28 15:57:31 +01:00
Zzooouhh	2d9fa97808	Merge pull request #4292 from Zzooouhh/Zzooouhh-jarkeld ... Implemented General Jarkeld	2017-12-28 13:09:22 +01:00
LevelX2	91efa42d0d	Merge origin/master	2017-12-28 12:57:53 +01:00
LevelX2	d85637336e	* Cabal Ritual, Gemstone Caverns, River of Tears - Fixed a problem that the tap for mana event was sent twice for theses lands (fixes #4288).	2017-12-28 12:57:16 +01:00
Oleg Agafonov	8a699bae81	Merge remote-tracking branch 'production/master' into production_master	2017-12-28 15:40:21 +04:00
Zzooouhh	cedfc5591b	Merge pull request #4293 from Zzooouhh/master ... Implemented Corrosion and Desolation	2017-12-28 12:39:54 +01:00
Oleg Agafonov	101cb304fb	Fixed typos	2017-12-28 15:39:00 +04:00
Zzooouhh	0b251e4dbd	Set nottarget to true	2017-12-28 12:31:06 +01:00
Zzooouhh	f82e404a0e	Naming change, set nottarget to true	2017-12-28 12:22:31 +01:00
LevelX2	2197fe2bcd	Merge origin/master	2017-12-28 12:14:01 +01:00
LevelX2	1f801d24df	Updated Naga Vitalist Test.	2017-12-28 12:13:20 +01:00
Zzooouhh	a44ae584a1	Merge pull request #4291 from Zzooouhh/Zzooouhh-masques ... Implemented some Masques cards	2017-12-28 12:05:14 +01:00
Zzooouhh	cc4a9afcda	Implemented General Jarkeld	2017-12-28 11:38:19 +01:00
Zzooouhh	e7888b0f26	Implemented General Jarkeld	2017-12-28 11:37:05 +01:00
Zzooouhh	732974acdc	Implemented Crag Saurian and Warpath	2017-12-28 11:31:47 +01:00
Oleg Agafonov	6afbcb638b	Updated cards for new choice dialog	2017-12-28 04:25:17 +04:00
Oleg Agafonov	3bdd2ae8bb	Fixed choice typos	2017-12-28 04:14:37 +04:00
Oleg Agafonov	9d1f6ed48e	Updated connection dialog (icons, hints and size fixes)	2017-12-28 03:53:10 +04:00
Oleg Agafonov	4654be5a7d	Fixed card's round corner render (more like real card);	2017-12-28 03:45:32 +04:00
Oleg Agafonov	7954031f41	Merge pull request #4283 from JayDi85/ui-choose-new ... Added new choose dialog	2017-12-28 02:59:09 +04:00
JRHerlehy	63cea560f3	Rsolves #4287 ... Test included to verify functionality.	2017-12-27 14:54:46 -08:00
Oleg Agafonov	2d48e14960	Tests: added error proof tests on "Vorinclex, Voice of Hunger fire up two times on mana tap instead one"	2017-12-28 02:29:31 +04:00
Oleg Agafonov	cdec4fe280	Tests: added error proof tests on "can't see new echanted land ability if it was added on same step" (Naga Vitalist)	2017-12-28 02:24:37 +04:00
Oleg Agafonov	7f1db2ef16	Tests: fixed dependence on random sort of ManaOptions result;	2017-12-28 02:18:54 +04:00
Oleg Agafonov	68c6551188	Fixed cards with any color lands produce ability: ... * Fixed ManaOptions result (no more duplicated records with same options); * Fixed mana types searching (now mana search return {Any} type too); * Fixed cards: Fellwar Stone, Harvester Druid, Reflecting Pool (#4125), Sylvok Explorer, Exotic Orchard (#3374), Naga Vitalist;	2017-12-28 02:15:49 +04:00
Oleg Agafonov	8fe1c46ade	Tests: fixed wrong assertManaPool assert messages	2017-12-28 01:57:37 +04:00
Oleg Agafonov	80b5026ec7	Search enabled by default	2017-12-27 06:42:27 +04:00
Oleg Agafonov	534e00e41f	Updated choose color dialog: added mana value and ability source	2017-12-27 06:32:24 +04:00
Oleg Agafonov	75cec526dc	Fixed magic "error switch" for unit tests	2017-12-27 06:26:05 +04:00
Zzooouhh	3de6f417dc	Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172)	2017-12-26 22:29:54 +01:00
Zzooouhh	a8ef0bd55e	Implemented Corrosion and Desolation	2017-12-26 16:56:50 +01:00
Zzooouhh	9d74c62cef	Implemented Desolation	2017-12-26 16:55:51 +01:00
Zzooouhh	502cfff1e7	Merge pull request #26 from Zzooouhh/Zzooouhh-visions ... Implemented Corrosion	2017-12-26 16:54:26 +01:00
Zzooouhh	f17f3d0949	Implemented Corrosion	2017-12-26 16:52:56 +01:00
Zzooouhh	3a7b1454f8	Implemented Corrosion	2017-12-26 16:50:46 +01:00
LevelX2	8228cee30c	* Some minor changes.	2017-12-26 10:59:28 +01:00
LevelX2	3a8afb9418	Merge pull request #4280 from skeate/master ... Curfew - Fix targeting/protection issue	2017-12-26 10:33:37 +01:00
Zzooouhh	6a6e7c677b	Implemented Keldon Twilight	2017-12-26 02:34:09 +01:00
Zzooouhh	c11484d1ca	Implemented Keldon Twilight	2017-12-26 02:33:08 +01:00
Zzooouhh	51669e9d0f	Text fix #2	2017-12-26 01:57:29 +01:00
Zzooouhh	3132a42cea	Text fix	2017-12-26 01:56:48 +01:00
Zzooouhh	7b6ee57bef	Implemented Warpath	2017-12-25 23:44:40 +01:00
Zzooouhh	a3460a2877	Implemented Crag Saurian	2017-12-25 22:52:39 +01:00
Zzooouhh	826de3114a	Implemented Orim's Cure and Revered Elder	2017-12-25 22:33:22 +01:00
Zzooouhh	6d39fa257b	Implemented Revered Elder	2017-12-25 22:03:56 +01:00
Zzooouhh	fae8e3b9b9	Implemented Orim's Cure	2017-12-25 22:01:39 +01:00
Zzooouhh	002a3e84ef	Merge pull request #25 from magefree/master ... Merge https://github.com/magefree/mage	2017-12-25 15:36:08 +01:00
Oleg Agafonov	531b5bc569	Added auto enabled search for all pickup dialogs with many items;	2017-12-25 12:47:30 +04:00
Oleg Agafonov	00d7a1f336	Updated cards for new choice type dialog	2017-12-25 08:23:55 +04:00
Oleg Agafonov	749ca59ad6	Added new choose dialog (creature types and etc): ... * added incremental search; * added keyboard hotkeys (up/down for select, enter for choose); * added choose by mouse double click; * added source card name; * fixed cancel button on required choice (#4230); * fixed text sizes form messages (now it's auto size);	2017-12-25 08:12:02 +04:00