38761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	5e4c7bce82	Merge branch 'master' into 'master' ... - Fixed trigger description on Octopus Umbra. See merge request core-developers/forge!825	2018-08-03 04:04:26 +00:00
Agetian	604010fbce	- Fixed trigger description on Octopus Umbra.	2018-08-03 07:03:57 +03:00
Michael Kamensky	4b4bab6086	Merge branch 'morec18newcards' into 'master' ... Nylea's Collossus, Octopus Umbra and Varina See merge request core-developers/forge!823	2018-08-03 04:02:41 +00:00
Michael Kamensky	7c38b97540	Merge branch 'brudiclad3' into 'master' ... Brudiclad, Telchor Engineer See merge request core-developers/forge!822	2018-08-03 03:57:20 +00:00
austinio7116	1fa768bb81	Nylea's Colossus	2018-08-03 00:01:16 +01:00
austinio7116	eda2ba4adf	A couple of scripts uploaded by Cryptix and inb63	2018-08-02 23:19:08 +01:00
Michael Kamensky	001a51a070	Merge branch 'master' into 'master' ... Fix for Quest Reward Multiplier Issue See merge request core-developers/forge!820	2018-08-02 03:50:49 +00:00
austinio7116	ac4d476ab3	Merge branch 'c18editions2' into 'master' ... C18 scripts created by the ForgeScribe neural network that look correct on… See merge request core-developers/forge!806	2018-08-01 22:12:09 +00:00
austinio7116	c41c3bd161	Brudiclad, Telchor Engineer ... (cherry picked from commit 9b83f7b)	2018-08-01 22:03:01 +01:00
Wario	e2e0123d2b	Update QuestWinLoseController.java	2018-08-01 20:37:58 +00:00
Michael Kamensky	7e0ebef57b	Merge branch 'commanderNinjutsu' into 'master' ... CardFactoryUtil: add Commander Ninjutsu variant See merge request core-developers/forge!819	2018-08-01 16:47:50 +00:00
Michael Kamensky	4f53188b94	Merge branch 'master' into 'master' ... Added a missing reference to Gyrus, Waker of Corpses. See merge request core-developers/forge!821	2018-08-01 16:44:10 +00:00
Agetian	653cbd7345	- Added a missing reference to Gyrus, Waker of Corpses.	2018-08-01 19:43:21 +03:00
Michael Kamensky	3e980f30aa	Merge branch 'c18fixedcards' into 'master' ... Gyrus, Waker of Corpses and Retrofitter Foundry See merge request core-developers/forge!817	2018-08-01 16:42:36 +00:00
Michael Kamensky	9acc59232b	Merge branch 'fixlordwindgrace' into 'master' ... Added cleanup to Lord Windgrace to fix first ability. See merge request core-developers/forge!818	2018-08-01 16:24:27 +00:00
Wario	33d7596cac	Update QuestWinLoseController.java	2018-08-01 12:25:11 +00:00
Wario	bded1d604a	Fix for Quest Reward Multiplier Issue	2018-08-01 11:21:07 +00:00
Hanmac	fd1fe2b0e4	CardFactoryUtil: add Commander Ninjutsu variant	2018-08-01 07:58:59 +02:00
austinio7116	b5ccfb11e7	Added cleanup to Lord Windgrace to fix first ability. ... (cherry picked from commit b286088)	2018-08-01 06:39:39 +01:00
austinio7116	d35af0a89d	Merge branch 'c18planeswalkers' into 'master' ... Lord Windgrace See merge request core-developers/forge!813	2018-07-31 09:31:41 +00:00
austinio7116	2462ce58ab	Gyrus, Waker of Corpses ... (cherry picked from commit 8dcfe38)	2018-07-31 10:30:38 +01:00
austinio7116	1d57c1a444	Retrofitter Foundry ... (cherry picked from commit 6c7161b)	2018-07-31 10:30:19 +01:00
austinio7116	3d55461332	Lord Windgrace - fixed oracle text brackets	2018-07-31 07:07:25 +01:00
austinio7116	cdb2474fa1	Merge branch 'etbCounterArixmethes' into 'master' ... GameAction: fixed putEtbCounters with Arixmethes See merge request core-developers/forge!814	2018-07-31 05:59:22 +00:00
Michael Kamensky	49e5cf7be0	Merge branch 'master' into 'master' ... Forge for Android publish 1.6.12.001 See merge request core-developers/forge!816	2018-07-31 04:03:22 +00:00
Agetian	3b6ab7e8c1	- Preparing Forge for Android publish 1.6.12.001 [incremental].	2018-07-31 07:02:02 +03:00
Blacksmith	0d15166137	[maven-release-plugin] prepare for next development iteration	2018-07-31 01:38:47 +00:00
Blacksmith	1d273d1c70	[maven-release-plugin] prepare release forge-1.6.12 forge-1.6.12	2018-07-31 01:38:44 +00:00
Blacksmith	ba540a73ec	Update README.txt for release	2018-07-31 01:36:50 +00:00
Mitchell Matthews	69de2ef5c5	Merge branch 'fix-suncleanser' into 'master' ... Fix bad encoding for Suncleanser See merge request core-developers/forge!815	2018-07-31 01:13:41 +00:00
tehdiplomat	b624832293	Fix bad encoding	2018-07-30 21:00:39 -04:00
Hanmac	d11bafd244	GameAction: fixed putEtbCounters with Arixmethes	2018-07-30 23:14:19 +02:00
NikolayHD	6256a157ab	codestyle	2018-07-30 22:40:42 +03:00
NikolayHD	43a12342e9	Fix incorrect path when extracting downloaded .zip	2018-07-30 22:40:42 +03:00
austinio7116	3d85051f7f	Merge branch 'arixmethes' into 'master' ... Arixmethes, plus slumber counters See merge request core-developers/forge!811	2018-07-30 15:57:29 +00:00
austinio7116	c83279ad1f	Lord Windgrace	2018-07-30 10:18:44 +01:00
austinio7116	e65dcbe6d5	Arixmethes - enters tapped	2018-07-29 20:21:20 +01:00
austinio7116	5e16d52ce9	Arixmethes - enters tapped	2018-07-29 20:14:29 +01:00
austinio7116	8331660825	Arixmethes, plus slumber counters	2018-07-29 19:30:48 +01:00
Hans Mackowiak	fc3cd818b2	Merge branch 'patch-1' into 'master' ... Update Kargan Dragonrider See merge request core-developers/forge!808	2018-07-29 12:12:06 +00:00
Hans Mackowiak	19ca07e65d	Update Kargan Dragonrider	2018-07-29 10:44:22 +00:00
austinio7116	e903cfc32c	Fixed Whiptongue Hydra	2018-07-29 10:36:12 +01:00
Michael Kamensky	5be840ab1d	Merge branch 'targetedOrControllerFix' into 'master' ... cards: fixed cards with TargetedOrController See merge request core-developers/forge!807	2018-07-29 08:56:23 +00:00
austinio7116	5567c32a4a	Fixed Ravenous Slime	2018-07-29 09:54:47 +01:00
Michael Kamensky	d3db01cf69	- Added missing DBDamageResolve to Which of You Burns Brightest.	2018-07-29 11:38:08 +03:00
austinio7116	1379e06678	Correcting/polishing AI generated C18 scripts	2018-07-29 09:10:38 +01:00
Hanmac	e4c4a87d45	cards: fixed cards with TargetedOrController	2018-07-29 09:56:52 +02:00
austinio7116	8f10afac00	C18 scripts created by the ForgeScribe neural network that look correct on visual inspection and load in Forge without crashing ... (cherry picked from commit b154229)	2018-07-29 07:33:33 +01:00
Michael Kamensky	8f8493bd47	Merge branch 'updateSparktongueDragon' into 'master' ... Update Sparktongue Dragon to use Immediate Trigger Effect See merge request core-developers/forge!805	2018-07-29 04:20:10 +00:00
tjtillmancoag	0d7081a119	Update Sparktongue Dragon to use Immediate Trigger Effect	2018-07-28 12:44:24 -07:00