21773 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
LevelX2	acc4c70f24	Added block formats.	2017-12-29 11:30:00 +01:00
Zzooouhh	bbd6da32fc	Implemented Retether	2017-12-29 06:45:34 +01:00
Zzooouhh	282a38537e	Implemented Retether	2017-12-29 06:43:56 +01:00
Zzooouhh	31648dbc0e	Changed PermanentImpl to Permanent	2017-12-29 05:31:55 +01:00
Oleg Agafonov	35ba9dc493	About updated: added L_J and JayDi85 to devs list	2017-12-29 07:56:54 +04:00
Oleg Agafonov	78b8d64649	Merge remote-tracking branch 'production/master' into production_master	2017-12-29 06:16:51 +04:00
Oleg Agafonov	1239592c2e	UI: added fast set/expansion search button in deck editor	2017-12-29 06:13:01 +04:00
Oleg Agafonov	af0c77a409	UI: added custom sorting in choice dialog	2017-12-29 06:11:10 +04:00
Zzooouhh	f93c55025e	Auras targetting tokens fix (fixes #4297)	2017-12-29 01:10:06 +01:00
Oleg Agafonov	35a950dc80	Merge remote-tracking branch 'production/master' into production_master	2017-12-29 04:03:45 +04:00
Oleg Agafonov	72aef2638c	UI: added close choice window with ESC button (if not required)	2017-12-29 04:03:31 +04:00
Oleg Agafonov	17bed090f0	UI: fixed inner country combobox data types;	2017-12-29 03:44:08 +04:00
Zzooouhh	c940aa72df	Edited cost	2017-12-28 21:59:35 +01:00
Zzooouhh	3121b2782f	Implemented Dr. Julius Jumblemorph	2017-12-28 20:52:57 +01:00
Zzooouhh	a32d6c62f5	Merge pull request #4295 from Zzooouhh/Zzooouhh-scourge ... Implemented some Scourge cards	2017-12-28 20:50:45 +01:00
Zzooouhh	14de3dd34b	Implemented cards	2017-12-28 20:49:39 +01:00
Zzooouhh	80e20dc472	Implemented Lingering Death	2017-12-28 20:49:00 +01:00
Zzooouhh	86b977dde0	Implemented Force Bubble	2017-12-28 20:48:23 +01:00
Zzooouhh	082854c78f	Implemented Frontline Strategist	2017-12-28 20:47:33 +01:00
Zzooouhh	80003e0148	Implemented Faces of the Past	2017-12-28 20:46:46 +01:00
Oleg Agafonov	800c0d20fc	UI: added search flag button to connection dialog;	2017-12-28 22:39:10 +04:00
Oleg Agafonov	e4dfa5925b	UI: added start selection value on choice dialog popup;	2017-12-28 22:38:18 +04:00
Zzooouhh	b0f5230137	Minor rewrite	2017-12-28 16:59:45 +01:00
LevelX2	80f71027d6	Merge origin/master	2017-12-28 16:56:13 +01:00
LevelX2	f88a42dd74	Merge origin/master	2017-12-28 16:53:56 +01:00
Zzooouhh	c25eaa9446	Fixed one overlooked instance of lethalDamage	2017-12-28 16:53:52 +01:00
LevelX2	d808b15569	* Hollow One - Fixed counting of discarded/cycled cards if returned to hand during a turn.	2017-12-28 16:52:51 +01:00
Zzooouhh	f166bebe8c	Fixed lethal damage potentially dipping into negative values ... Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder)	2017-12-28 16:49:51 +01:00
LevelX2	6d17199129	* Toxin Sliver - Fixed that the damaged creature was not destroyed.	2017-12-28 15:57:31 +01:00
Zzooouhh	066f6ca2a5	Implemented Dr. Julius Jumblemorph (without host)	2017-12-28 15:04:46 +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