6455 commits

Author	SHA1	Message	Date
spjspj	f9896be537	Add The Big Idea (UST)	2017-12-23 18:32:20 +11:00
spjspj	118e05516a	Merge pull request #4273 from spjspj/master ... Slight fix	2017-12-23 15:44:01 +10:00
spjspj	5272b88947	Slight fix	2017-12-23 16:43:10 +11:00
Zzooouhh	6fae8ef606	Merge branch 'master' into master	2017-12-22 23:17:20 +01:00
Oleg Agafonov	8624671a52	typos	2017-12-22 09:23:33 +04:00
Oleg Agafonov	39ca5a13f4	Added new set: Explorers of Ixalan (47 cards, 1 token)	2017-12-22 09:18:41 +04:00
LevelX2	43c732c751	[RIX] Added Vona's Hunger.	2017-12-21 17:08:24 +01:00
spjspj	856cb2b71d	Merge pull request #4267 from spjspj/master ... Add Arboria (LEG)	2017-12-21 16:25:48 +10:00
spjspj	3055bac004	Add Arboria (LEG)	2017-12-21 17:07:08 +11:00
LevelX2	eecc322618	[RIX] Added Brass's Bounty.	2017-12-20 16:26:08 +01:00
spjspj	38272a6dde	Add Arboria (LEG)	2017-12-21 01:08:55 +11:00
Zzooouhh	bf6939f45b	Included overflow check methods	2017-12-20 00:31:31 +01:00
Zzooouhh	40561e900a	Included overflow check methods	2017-12-20 00:29:36 +01:00
Zzooouhh	35bbe20b95	Included overflow check methods	2017-12-20 00:21:44 +01:00
Zzooouhh	29c9ce696d	Included overflow check methods	2017-12-20 00:20:27 +01:00
Zzooouhh	4a6ff5593e	More edits	2017-12-19 01:40:44 +01:00
Zzooouhh	a4ce4e4b17	Merge pull request #23 from magefree/master ... Merge https://github.com/magefree/mage	2017-12-18 03:08:01 +01:00
Zzooouhh	860909408d	Minor improvement	2017-12-17 23:03:54 +01:00
Zzooouhh	aa7231bec0	Expanded DoUnlessTargetPlayerOrTargetsControllerPaysEffect	2017-12-17 19:41:22 +01:00
Zzooouhh	982c178921	Added DoUnlessTargetPlayerOrTargetsControllerPaysEffect	2017-12-17 14:46:24 +01:00
spjspj	578ea668bb	Add Summon The Pack (modification - needs the creatures to be zombies (done) but not black)	2017-12-18 00:28:37 +11:00
spjspj	b17d35dff3	Add 1.25 UST cards	2017-12-16 18:04:26 +11:00
spjspj	667b2affdf	Add 2 unstable cards.	2017-12-16 00:34:21 +11:00
spjspj	635c446148	Add 2 unstable cards.	2017-12-14 23:44:18 +11:00
spjspj	f39a0d4a77	Add 2 unstable cards.	2017-12-14 19:21:53 +11:00
spjspj	7645f10202	Add 2 unstable cards.	2017-12-14 10:14:48 +11:00
spjspj	7c855990c9	Add 1 unstable card. Fix dice roll (was only returning '0-(n-1)')	2017-12-12 00:08:37 +11:00
spjspj	46cbaed493	Merge branch 'master' of https://github.com/spjspj/mage	2017-12-10 23:02:33 +11:00
spjspj	eb9f50e370	Crow Storm!	2017-12-10 23:01:55 +11:00
spjspj	f5d16a930f	Merge branch 'master' into master	2017-12-10 21:54:02 +10:00
spjspj	eca218881c	Start adding in Dice Roll effects	2017-12-10 22:51:08 +11:00
spjspj	8e3daf54a9	Start adding in Dice Roll effects	2017-12-10 22:49:55 +11:00
Oleg Agafonov	dce69c18dc	+ improved deck import from deckstats	2017-12-09 18:52:24 +04:00
Oleg Agafonov	763594e579	type	2017-12-08 00:53:46 +04:00
Oleg Agafonov	5fc0393bc7	Deck editor: ... + added warning messages dialog after load/import decks with errors (instead throw exception); + added loading cursors on import-load decks; - fixed null exception error on empty/error deck loading;	2017-12-08 00:20:18 +04:00
Oleg Agafonov	1efc062f66	Decks importer: ... + added support for new decklist text format from deckstats.net (see #4228); + added new checks to text format (too many empty lines, too big card number: more then 100); + fixed double window popup on cancel/close import from clipboard window;	2017-12-07 23:14:22 +04:00
Zzooouhh	230233659b	Some naming changes, Butcher Orgg first strike fix	2017-12-07 11:13:27 +01:00
Oleg Agafonov	5b7ab0de7a	typo	2017-12-07 08:41:59 +04:00
Oleg Agafonov	66a70dd116	- Fixed #4220 - card viewer raise error with alternative card numbers; ... - Fixed potential error on getCardsByRarity; - Added inner checks for wrong booster max card numbers settings;	2017-12-07 08:01:54 +04:00
Zzooouhh	d8daec11d4	Fixed Butcher Orgg handling attackers/blockers leaving combat	2017-12-07 01:04:31 +01:00
Zzooouhh	d6a08fbdd7	NullPointerException fix	2017-12-07 01:01:52 +01:00
Zzooouhh	e1fdc3093a	Some other edits + small fix for Defensive Formation	2017-12-06 21:30:33 +01:00
Zzooouhh	5fec04935d	Optimization edit for assignDamageToBlockers	2017-12-06 20:31:54 +01:00
Zzooouhh	c6e69868fa	Test message cleanup	2017-12-06 19:50:06 +01:00
Zzooouhh	edd07d4f80	Implemented Butcher Orgg (the missing bits)	2017-12-06 19:46:13 +01:00
Zzooouhh	16513408fc	Cleanup #2	2017-12-06 17:05:30 +01:00
Zzooouhh	b48c37ea8f	Defensive Formation slight cleanup	2017-12-06 17:02:49 +01:00
Zzooouhh	47ef2a4ce4	Implemented Butcher Orgg (partially) ... Option to divide damage while being a blocker doesn't work for some reason	2017-12-06 16:31:36 +01:00
Zzooouhh	dcce07cfdc	Implemented Butcher Orgg	2017-12-06 15:00:09 +01:00
LevelX2	8fac7a3dc1	XMage 1.4.26V9	2017-12-03 18:15:16 +01:00
Zzooouhh	7d72172c60	Included Echo counter type	2017-12-02 16:36:54 +01:00
LevelX2	b2e3201ea4	[RIX] Added some cards. Added some spoiler texts to mtg-cards-data.txt	2017-12-02 13:39:30 +01:00
Zzooouhh	659e3d7015	Merge branch 'master' into master	2017-11-26 21:17:27 +01:00
Zzooouhh	32ef8a5047	Small damage fix	2017-11-25 09:10:01 +01:00
Zzooouhh	200e5e07bf	Hollowhenge Spirit fix (partial fix for #4172)	2017-11-25 08:48:21 +01:00
Zzooouhh	b035c436d5	Another small fix	2017-11-25 08:35:18 +01:00
Zzooouhh	a7514fc671	Added mustBlockAllAttackers	2017-11-25 07:49:30 +01:00
Zzooouhh	7cf73917e6	Added mustBlockAllAttackers	2017-11-25 07:47:39 +01:00
Zzooouhh	92e5d8de0a	multiAttackerDamage fix	2017-11-25 07:20:25 +01:00
LevelX2	53448e6dc4	Ficed a problem with Bestow, adding multiple times "AURA" subtype.	2017-11-24 12:30:15 +01:00
Zzooouhh	19ef8f47f2	Final fix	2017-11-23 10:07:54 +01:00
Zzooouhh	0e2096395a	Another watcher fix	2017-11-23 09:56:07 +01:00
Zzooouhh	ce3176adf2	Fix for Giant Turtle/Halls of Mist watcher	2017-11-23 09:32:14 +01:00
Zzooouhh	a40e80e9e5	Created new watcher for Giant Turtle	2017-11-22 20:21:30 +01:00
Zzooouhh	813219df2d	Some changes to how Defensive Formation handles lethal damage	2017-11-22 11:28:36 +01:00
Zzooouhh	bb56568ea1	Implemented Defensive Formation	2017-11-22 02:13:22 +01:00
Zzooouhh	877a98d3d5	Implemented Defensive Formation	2017-11-22 02:08:00 +01:00
Evan Kranzler	afcf3a43d2	fixed Simic Manipulator implementation	2017-11-21 16:42:27 -05:00
Zzooouhh	bbc5f4594b	Implemented Imprison	2017-11-21 17:03:15 +01:00
Zzooouhh	6164a631ba	Fix for Umbra Mystic	2017-11-20 19:17:14 +01:00
theelk801	ad249d7c6b	Merge pull request #4158 from Zzooouhh/master ... Implemented more cards & fix for Grinning Totem	2017-11-18 09:52:01 -05:00
Zzooouhh	8ffa590a08	Alleged text fix ... Will this mess up anything?	2017-11-18 06:59:31 +01:00
Zzooouhh	5cc042779a	Implemented False Orders and Balduvian Warlord	2017-11-17 23:45:40 +01:00
Zzooouhh	ad9b95553f	Implemented Tombstone Stairwell	2017-11-15 00:05:29 +01:00
Zzooouhh	5d1ef487bf	Text fix	2017-11-13 22:03:37 +01:00
Evan Kranzler	036bc12508	fixed delayed end step triggers not triggering if created during an end step	2017-11-11 10:21:17 -05:00
Zzooouhh	de21a86913	Implemented Telekinesis	2017-11-11 12:59:46 +01:00
Zzooouhh	c63da1bb67	Made choosing at least one color mandatory ... 10/1/2005: You can choose any single color or any combination of more than one color. You can't choose colorless.	2017-11-11 12:17:42 +01:00
Zzooouhh	a52c98aa25	Typo fix	2017-11-05 20:49:39 +01:00
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	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	9a28f8d678	* Fixed that conditional mana colors were not tracked correctly for abilities like Converge.	2017-11-04 16:48:13 +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	7202e27891	Merge origin/master	2017-11-02 11:17:40 +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	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	9423c30245	Fix for #4131	2017-11-01 20:40:49 +01:00
Zzooouhh	6e1a3b1b11	Removed garbage imports	2017-10-26 16:06:16 +02:00
Zzooouhh	1296537765	Included new watcher for "you choose blockers..." effects	2017-10-26 15:54:52 +02:00
Zzooouhh	7afb7eb2c5	Merge branch 'master' into master	2017-10-25 16:15:07 +02:00
Evan Kranzler	3746fddf54	fixed Angelic Accord displaying the wrong amount of life gain required (fixes #4132 and #4133)	2017-10-25 07:24:49 -04:00
Zzooouhh	fe9ce16ed2	Reverted MeleeAbility.calculate	2017-10-25 01:10:02 +02:00
Zzooouhh	6a8ce4c6ea	Delete JohanVigilanceAbility.java	2017-10-24 17:04:35 +02:00
Zzooouhh	549f89ac20	Update Combat.java	2017-10-24 17:04:12 +02:00
Zzooouhh	58ff5e017a	Moved JohanVigilanceAbility	2017-10-24 17:01:46 +02:00
Zzooouhh	e82d640060	Implemented Johan	2017-10-24 06:12:10 +02:00
Zzooouhh	7c5562881b	Implemented Johan	2017-10-24 06:10:06 +02:00
Zzooouhh	b153a7c2a2	Implemented Custodi Soulcaller	2017-10-22 23:39:31 +02:00
Zzooouhh	db8e38b587	Implemented Johan	2017-10-22 16:48:47 +02:00
Evan Kranzler	f29141605b	fixed Nissa, Genesis Mage -10 forcing players to put 10 cards into play in order to continue	2017-10-22 09:16:51 -04:00
LevelX2	919ec2fade	Merge origin/master	2017-10-21 16:14:14 +02:00
LevelX2	58d3fc2328	Fixed player leaving/conceding handling.	2017-10-21 16:13:45 +02:00
Evan Kranzler	b30335e344	Implemented Momentum	2017-10-20 10:58:44 -04:00
Evan Kranzler	1452e10128	Implemented Waylay	2017-10-19 07:34:46 -04:00
Evan Kranzler	8cbffc89d8	updated some text and implementations	2017-10-18 14:53:30 -04:00
Evan Kranzler	08bdfcc961	updated some text and implementations	2017-10-18 14:45:30 -04:00
Evan Kranzler	474048bcbc	fixed implementation of Confusion in the Ranks	2017-10-17 14:02:47 -04:00
Evan Kranzler	ba31763a7a	Implemented Rally the Troops	2017-10-16 20:29:53 -04:00
Evan Kranzler	457269cb12	fixed some range of influence issues	2017-10-16 18:12:57 -04:00
Evan Kranzler	587e8a75ef	fixed phased-out permanents not being invalid targets upon resolution	2017-10-16 17:04:04 -04:00
Evan Kranzler	79d4c07d20	updated how Withering Wisps and limited use activated abilities are implemented	2017-10-14 09:04:45 -04:00
Zzooouhh	5735515a31	Implemented Ovinomancer	2017-10-14 10:22:53 +02:00
igoudt	81875d19dc	revert cardtextpredicate to fix issue #4091	2017-10-14 10:07:17 +02:00
Zzooouhh	eba43f1905	Create SacrificeAttachedCost.java	2017-10-12 23:14:09 +02:00
Zzooouhh	36fed5d72e	Create TapAttachedCost.java	2017-10-12 21:28:52 +02:00
Zzooouhh	c82f38e3df	(Credit where it's due)	2017-10-12 18:29:04 +02:00
Zzooouhh	c3c8148baf	Create SkipUntapStepEffect.java	2017-10-12 18:24:32 +02:00
Evan Kranzler	0fc3afb235	fixed Evangelize not being castable when caster controls no creatures. ... (fixes #4094)	2017-10-12 07:56:45 -04:00
Evan Kranzler	9b51694908	fixed embalm and eternalize sometimes giving the token to the wrong player	2017-10-11 13:09:39 -04:00
Evan Kranzler	ab632ef1d0	small fix	2017-10-11 08:35:33 -04:00
Evan Kranzler	81a1e81525	fixed being able to cast spells from an opponents hand when revealed. (fixes #4102)	2017-10-10 19:27:03 -04:00
Evan Kranzler	4116b58414	fixed Venser, Shaper Savant and other similar cards not properly removing copied spells from the stack (fixes #4072)	2017-10-10 16:58:40 -04:00
Evan Kranzler	80f21132eb	fixed Nivmagus Elemental being able to infinitely exile copied spells (fixes #4092)	2017-10-10 16:25:15 -04:00
Evan Kranzler	fdf3f831ca	updated cards which phase things out to properly handle indirect phasing ... (#4071)	2017-10-10 14:32:08 -04:00
Evan Kranzler	3d20e4dbef	changed how phasing is handled	2017-10-10 13:37:05 -04:00
theelk801	51f0e92103	Merge pull request #4100 from magefree/master ... merge	2017-10-10 11:25:00 -04:00
Evan Kranzler	118978e39d	text fixes	2017-10-09 12:23:14 -04:00
Evan Kranzler	f16b5881e8	fext tixes	2017-10-08 09:33:01 -04:00
Evan Kranzler	54b8f10c3c	text fixes and test fixes to fix how tests test text, then more text next	2017-10-07 16:08:06 -04:00
Evan Kranzler	14107b3d55	2 text 2 fixrious	2017-10-07 11:02:36 -04:00
Evan Kranzler	0075535650	so many text fixes	2017-10-06 22:00:06 -04:00
Evan Kranzler	bc2bfba02a	more text fixes	2017-10-06 18:28:22 -04:00
Evan Kranzler	3baabe2534	some text fixes	2017-10-06 16:55:46 -04:00
Evan Kranzler	a63e024ea4	initial setup for phasing fix	2017-10-06 12:29:14 -04:00
Evan Kranzler	0ea78d21ef	Implemented Spheres from Odyssey	2017-10-05 20:13:48 -04:00
Evan Kranzler	b320d1d0f0	Implemented Forgotten Harvest	2017-10-05 18:02:10 -04:00
Evan Kranzler	2733d736d5	fixed Curtain of Light targeting, updated how being unblocked is checked	2017-10-05 13:41:12 -04:00
Evan Kranzler	3b0b923b7c	Implemented Weathered Bodyguards	2017-10-05 13:31:05 -04:00
Evan Kranzler	8c20861e92	Implemented Kjeldoran Home Guard	2017-10-04 18:32:46 -04:00
Evan Kranzler	6725c50b4a	Implemented Elder Land Wurm	2017-10-04 14:19:10 -04:00
Evan Kranzler	1453fa46a7	Fixed Urborg's functionality, also fixed Scarwood Hag not removing forestwalk properly (#4088)	2017-10-03 15:54:42 -04:00
LevelX2	71336a916d	XMage 1.4.26V7	2017-10-03 18:41:06 +02:00
LevelX2	4a71f8af67	Some minot fixes /changes.	2017-10-03 17:24:35 +02:00
Evan Kranzler	de8ae96aaa	Fixed Hour of Eternity's targeting and another small fix that was causing an error	2017-10-02 20:55:02 -04:00