22065 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
LevelX2	f5f6f924f9	XMage 1.4.26V8	2017-11-04 18:50:00 +01:00
LevelX2	a5e80d66f1	Merge origin/master	2017-11-04 18:20:35 +01:00
LevelX2	8cf6a97616	* Fixed a problem with index out of bound for card renderer.	2017-11-04 18:20:17 +01:00
LevelX2	0d46c68924	* Fixed some problems for handling concede during game init.	2017-11-04 18:19:41 +01:00
Evan Kranzler	cddae049d6	fixed life loss triggers triggering off of 0 life	2017-11-04 12:15:33 -04:00
LevelX2	5a9671cbca	* Mist of Stagnation - Fixed untap effect.	2017-11-04 17:08:44 +01:00
LevelX2	874de47b28	* Kopala, Warden of Waves - Fixed that the cost modification did not work correctly for multi modal spells.	2017-11-04 16:56:17 +01:00
LevelX2	9a28f8d678	* Fixed that conditional mana colors were not tracked correctly for abilities like Converge.	2017-11-04 16:48:13 +01:00
LevelX2	89542ccb67	* Removed unused code.	2017-11-04 16:22:10 +01:00
LevelX2	d2c649e6f9	Merge pull request #4144 from Zzooouhh/master ... Implemented Norritt, Season of the Witch, Total War, Elkin Lair, Risky Move & small War Tax fix	2017-11-04 16:14:35 +01:00
Zzooouhh	53aa0136b8	Implemented Risky Move	2017-11-04 16:04:22 +01:00
Zzooouhh	39d2471132	Implemented Risky Move	2017-11-04 16:04:10 +01:00
Evan Kranzler	cefb0225de	fixed Invasion Plans text	2017-11-03 22:31:48 -04:00
Evan Kranzler	5b18cfb042	fixed Darksteel Mutation incorrectly changing color	2017-11-03 22:30:20 -04:00
Zzooouhh	c6567360ed	Implemented Elkin Lair	2017-11-04 01:00:31 +01:00
Zzooouhh	feb798ec72	Implemented Elkin Lair	2017-11-04 00:59:47 +01:00
Zzooouhh	299e164da3	Fixed War Tax to work with Seasons of the Witch (fixes #4145)	2017-11-03 21:19:47 +01:00
Zzooouhh	4176b35f2a	Allowed choosing X=0 to act as an attack cost	2017-11-03 19:15:35 +01:00
Zzooouhh	b352a31852	Implemented Season of the Witch	2017-11-03 19:13:07 +01:00
Zzooouhh	da9cc63ce0	Implemented Norritt and Total War	2017-11-03 19:11:53 +01:00
Zzooouhh	ec0fc182c0	Moved TotalWar.java	2017-11-03 19:09:20 +01:00
Zzooouhh	89398d97b3	Implemented Total War	2017-11-03 19:08:38 +01:00
Zzooouhh	e94c8a2dd2	Implemented Season of the Witch	2017-11-03 19:07:52 +01:00
Zzooouhh	16924b0c9b	Implemented Norritt	2017-11-03 19:06:20 +01:00
Zzooouhh	07cee19809	Merge pull request #17 from magefree/master ... Merge https://github.com/magefree/mage	2017-11-03 19:02:15 +01:00
LevelX2	9704d21c82	* Fixed a problem with player leaving the game during multiplayer game.	2017-11-03 15:50:01 +01:00
LevelX2	9e4beb6b51	* Nettling Impl - Fixed that the conditional delayed destroy ability did not work corretly (fixes #4142).	2017-11-03 14:59:26 +01:00
LevelX2	583033ff3b	Merge pull request #4139 from Zzooouhh/master ... Implemented a whole bunch of cards + fixes for #4131, #4137, #4138 and #4090	2017-11-02 14:08:26 +01:00
LevelX2	02b97aa9b3	Some fixes to: Merge pull request #4129 from jerekwilson/master - Implementing 5 cards	2017-11-02 13:43:49 +01:00
LevelX2	5ca06ee0dd	Merge pull request #4129 from jerekwilson/master ... Implementing 5 cards	2017-11-02 11:30:33 +01:00
LevelX2	cc91a956d4	Merge branch 'master' into master	2017-11-02 11:30:19 +01:00
LevelX2	9700445fae	Merge branch 'master' into master	2017-11-02 11:29:47 +01:00
LevelX2	7202e27891	Merge origin/master	2017-11-02 11:17:40 +01:00
LevelX2	c395038fce	Minor changes.	2017-11-02 11:17:14 +01:00
LevelX2	b4ee3ff1da	Merge pull request #4101 from magefree/phasingFix ... Fixed how phasing is implemented	2017-11-02 11:00:33 +01:00
LevelX2	4644a8d62f	Merge origin/master	2017-11-02 10:36:32 +01:00
LevelX2	9eb4a931d3	Merge pull request #4135 from Faxn/fix/DecreeOfJustice ... Fix #4130 Decree of Justice	2017-11-02 10:35:43 +01:00
LevelX2	f1bbb37c81	Merge origin/master	2017-11-02 10:29:04 +01:00
Zzooouhh	f653ddb921	Another fix for #4090	2017-11-02 07:05:33 +01:00
Zzooouhh	4c8245020a	Fixed redirection bug	2017-11-02 06:41:01 +01:00
Zzooouhh	a9089edff5	(insignificant?) fix	2017-11-01 22:20:54 +01:00
Zzooouhh	5aef889ea8	(insignificant?) fix	2017-11-01 22:20:37 +01:00
Zzooouhh	896bcc504c	Lousy fix for #4138	2017-11-01 22:17:40 +01:00
Zzooouhh	9423c30245	Fix for #4131	2017-11-01 20:40:49 +01:00
Zzooouhh	3b237cc945	Fixed redirection bug	2017-11-01 18:45:38 +01:00
Zzooouhh	4823f25c29	Fixed some microbugs	2017-11-01 18:06:12 +01:00
Zzooouhh	960a6d7d5d	Implemented Martyrdom	2017-11-01 12:35:45 +01:00
Zzooouhh	84029a99b6	Implemented Laccolith Rig	2017-11-01 12:35:35 +01:00
Zzooouhh	94e4394c31	Implemented Martyrdom	2017-11-01 12:35:20 +01:00
Zzooouhh	d3f3591513	Implemented Laccolith Rig	2017-11-01 12:35:11 +01:00