22917 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
AdamJAKing	26c9c80d68	Card hint window now disappears for all cards	2018-04-02 21:49:18 +01:00
L_J	b2d4db1d27	Implemented Brutal Suppression	2018-04-02 19:18:06 +00:00
L_J	e88a6a1fad	Implemented Brutal Suppression	2018-04-02 19:17:41 +00:00
Marc Zwart	3ff34051ce	first few Tokens from sets module made compliant with abstract Token class	2018-04-02 17:48:39 +02:00
Marc Zwart	a68cac5a2b	replaced concrete usages of Token with new subclasses of abstract Token class	2018-04-02 17:47:57 +02:00
Marc Zwart	03eb170a04	made permanent tokens from framework compliant with new abstract superclass	2018-04-02 17:47:04 +02:00
Marc Zwart	2d922cb6af	marked Token class as abstract and removed abstracted copy method	2018-04-02 17:45:56 +02:00
LevelX2	1e2e53073c	* Deep Analysis - Fixed that its flashback costs did not work with mana casting cost modification effects (fixes #4677).	2018-04-02 15:30:57 +02:00
spjspj	8621ecdd6f	Merge pull request #4703 from spjspj/master ... Attempt to allow players to fix the game if the active/choosing/perso…	2018-04-02 20:16:17 +10:00
spjspj	471d49892f	Attempt to allow players to fix the game if the active/choosing/person with priority has left or has run down the clock	2018-04-02 19:31:05 +10:00
spjspj	d5374554c0	Merge pull request #4702 from rystan/master ... Update Feline Ferocity deck to include missing card	2018-04-02 13:35:27 +10:00
Michael Simons	b894eba0c2	Merge pull request #2 from rystan/feline-ferocity ... Update Feline Ferocity to include missing card	2018-04-01 22:28:23 -04:00
Michael Simons	97d0f32889	Update Feline Ferocity to include missing card ... Added missing "Stalking Leonin" that was implemented after deck was built.	2018-04-01 22:27:33 -04:00
L_J	ee2c475c87	Implemented Mine, Mine, Mine!	2018-04-02 01:09:56 +00:00
L_J	56b124c524	Implemented Mine, Mine, Mine! ... For some reason, making MineMineMineDontLoseEffect replace EventType.EMPTY_DRAW still resulted in a game loss	2018-04-02 01:09:22 +00:00
LevelX2	337025b614	Merge pull request #4699 from spjspj/master ... Add an on-hover highlight effect.	2018-04-01 23:48:26 +02:00
Oleg Agafonov	c98dcbd55a	Merge pull request #4700 from rystan/master ... 2 additional Planeswalker decks	2018-04-01 19:52:59 +04:00
Michael Simons	9912ab51e6	Merge pull request #1 from rystan/2-new-decks ... 2 additional Planeswalker decks	2018-04-01 11:09:28 -04:00
Michael Simons	ef44c57a32	2 additional Planeswalker decks	2018-04-01 11:08:39 -04:00
spjspj	7698856d29	Add an on-hover highlight effect.	2018-04-02 01:01:32 +10:00
L_J	51bfbc6705	Edited applies and checksEventType	2018-04-01 12:05:31 +00:00
spjspj	e2fbe8cee9	Merge pull request #4697 from spjspj/master ... Add an on-hover over avatar highlight effect.	2018-04-01 21:49:43 +10:00
spjspj	2ff3d2ca87	Add an on-hover highlight effect.	2018-04-01 21:40:16 +10:00
LevelX2	93b821375c	Merge origin/master	2018-04-01 12:34:30 +02:00
LevelX2	20f03cfcb1	Some minor changes to Momir code.	2018-04-01 12:33:59 +02:00
LevelX2	ef2b1ef169	Merge pull request #4695 from rystan/master ... Add missing mountain to Commander 2016 Entropic Uprising deck	2018-04-01 10:02:05 +02:00
Michael Simons	936bab3303	Add missing mountain to Commander 2016 Entropic Uprising deck ... Fixes issue #4694	2018-04-01 00:43:45 -04:00
L_J	7bbfe9f2ae	Growth Spurt text fix	2018-03-31 13:41:38 +00:00
spjspj	cdc68e3323	Merge pull request #4689 from spjspj/master ... Add 'Choose Matching' to deck editor	2018-03-31 18:06:44 +11:00
spjspj	b69f2c4fd8	Add 'Choose Matching' to deck editor	2018-03-31 17:55:55 +11:00
L_J	1dff6d9c48	Fix for Cabal Slaver ... Cabal Slaver's ability caused the damaging goblin's controller to discard	2018-03-31 00:07:36 +00:00
L_J	6c98f4802e	Fix for Cabal Slaver ... Cabal Slaver's ability caused the damaging goblin's controller to discard	2018-03-31 00:06:44 +00:00
Oleg Agafonov	57db49fcf0	Merge pull request #4683 from delftswa2018/hotfix/readme-card-count ... Fix readme.md card count	2018-03-29 18:30:41 +04:00
Christiaan	834d4ba921	Merge branch 'master' into hotfix/readme-card-count	2018-03-29 16:03:04 +02:00
Oleg Agafonov	fc065bbe3c	Little fixes	2018-03-29 17:55:22 +04:00
chrvanorle	45724e8bf9	Merge pull request #5 from magefree/master ... Merge upstream into master	2018-03-29 15:52:07 +02:00
Oleg Agafonov	8563c6d865	Merge pull request #4682 from delftswa2018/hotfix/resolving-unaccepted-changes ... Hotfix - resolving unaccepted changes	2018-03-29 17:25:04 +04:00
Oleg Agafonov	d7237c4afa	Merge pull request #4681 from delftswa2018/feature/ClickableMsgOfTheDay ... Clickable message of the day	2018-03-29 17:24:50 +04:00
Oleg Agafonov	0939aefe51	Merge pull request #4680 from delftswa2018/feature/loadingtime ... Improved XMage startup time	2018-03-29 17:23:38 +04:00
Christiaan	4dd34902c1	Fixed card count in readme	2018-03-29 14:14:36 +02:00
chrvanorle	6936a8ef51	Merge pull request #4 from magefree/master ... Merge upstream into master	2018-03-29 14:04:07 +02:00
Marc Zwart	fed2f31789	set lock calls back to original place as per request	2018-03-29 13:56:10 +02:00
Marc Zwart	a7ffaafcb0	made close call safe	2018-03-29 13:53:59 +02:00
Danny Plenge	aa96caa554	Removed useless else case	2018-03-29 12:54:43 +02:00
spjspj	bd29eaaa82	Merge pull request #4674 from spjspj/master ... Have a faded life total over the avatar which glows then fades again …	2018-03-29 08:40:17 +11:00
Jeff	4c67d96feb	- Added a requested card Retribution.	2018-03-28 09:49:18 -05:00
spjspj	938ac35981	Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain.	2018-03-29 00:28:56 +11:00
Danny Plenge	98c2b171de	Added the URLHandler which makes the URL's in the message of the day clickable. ... At the moment when there are 2 URL's in 1 message, it only makes the last one clickable.	2018-03-28 13:49:04 +02:00
Danny Plenge	7d7cd64b1e	Merge pull request #3 from magefree/master ... Update Master	2018-03-28 11:20:45 +02:00
spjspj	2d32ec0a80	Merge pull request #4668 from spjspj/master ... Have a faded life total over the avatar which glows then fades again	2018-03-28 09:28:42 +11:00