1995 commits

Author	SHA1	Message	Date
LevelX2	84a815eb73	Merge origin/master	2018-01-27 17:57:27 +01:00
LevelX2	f5499531c7	Fixed that combat damage triggered abilities go to stack during the related combat step.	2018-01-27 17:56:46 +01:00
Quercitron	ad74ddd981	* Infernal Genesis - Fix that incorrect Minion creature token was used (closes #4445)	2018-01-27 18:35:43 +03:00
LevelX2	2f016c8ea6	Fixed some more exception and/or logging problems.	2018-01-27 13:19:20 +01:00
Ben Dawes	2f4b6ca713	BecomeCreatureAllEffect used to always calculate the permanent set to apply to every time it is applied ... Now we calculate it either at init-time (for abilities with affected object sets) OR at apply-time (Static abilities etc.)	2018-01-27 11:51:16 +00:00
Oleg Agafonov	9268281c4b	Tests: fixed random gen deck	2018-01-27 15:49:24 +04:00
LevelX2	020beb1bf6	Merge origin/master	2018-01-27 11:43:01 +01:00
LevelX2	6b90c1fd7f	Fixed some exception problems.	2018-01-27 11:42:43 +01:00
Oleg Agafonov	1b191a5f93	Fixed temporary effects copy between game states, fixed concurrent access errors while execute some cheat commands;	2018-01-27 13:26:04 +04:00
Oleg Agafonov	c69b3f4609	Fixed wrong players compare (not by UUID -- see #4407)	2018-01-27 13:23:03 +04:00
Oleg Agafonov	9d131f6bde	Random generated decks improvements and fixes for AI: ... * added generation of only basic lands decks; * fixed wrong color cards selection;	2018-01-27 13:19:03 +04:00
spjspj	8db20dbe8d	Merge pull request #4430 from spjspj/master ... Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 22:20:03 +11:00
spjspj	d095f83d8a	Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 21:28:47 +11:00
spjspj	af48b17451	Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)	2018-01-19 20:30:12 +11:00
Oleg Agafonov	89f5967441	* [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too);	2018-01-18 07:02:02 +04:00
L_J	1dceae4e95	Implemented Lurker	2018-01-17 20:34:35 +00:00
Achilles	6da1112a89	- Code by Noxx to address the Blood Moon/Urborgtoy layering issue. Layer test updated.	2018-01-15 18:47:42 -06:00
Oleg Agafonov	98cc704592	Fixed visible empty sets in new tournament dialog (#4415)	2018-01-14 20:54:42 +04:00
igoudt	7f319c2751	fix null-check in raging river and a watcher	2018-01-13 23:26:35 +01:00
LevelX2	ed3742b1e4	Merge origin/master	2018-01-13 22:55:44 +01:00
LevelX2	40afa04b24	xmage 1.4.27V0	2018-01-13 22:54:53 +01:00
Zzooouhh	d4e2b70cf3	Added hunger counter	2018-01-13 19:14:39 +00:00
LevelX2	9a760670dd	* Fixed that Explore did not trigger if it was initiated from a instant or sorcery.	2018-01-13 19:37:36 +01:00
LevelX2	2e3ba7e104	Added designation names to player tooltip.	2018-01-13 18:55:07 +01:00
LevelX2	6693929557	* Some refactoring.	2018-01-13 14:45:50 +01:00
Oleg Agafonov	9a0b48e9b7	Little fix on filter	2018-01-13 14:58:43 +04:00
LevelX2	393f8dc9f4	* World at War - Fixed that its extra Main Phase was not executed (fixes #4382).	2018-01-13 11:14:13 +01:00
LevelX2	524541040f	* Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405).	2018-01-13 10:20:35 +01:00
LevelX2	83528369ee	* Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405).	2018-01-13 09:25:31 +01:00
Achilles	7ade17595d	- Aftermath keyword works again. Added test for Aftermath keyword.	2018-01-12 23:58:38 -06:00
Oleg Agafonov	4771ad2c63	Fixed UGL test, rename new token	2018-01-13 02:27:16 +04:00
Oleg Agafonov	9b740b8cbb	Merge pull request #4363 from SpikesCafe-google/master ... Implement "Pure Reflection" card from Invasion.	2018-01-13 02:23:30 +04:00
Oleg Agafonov	bbdf762775	Merge pull request #4404 from Zzooouhh/Zzooouhh-sporogenesis ... Implemented Sporogenesis & some The Dark cards	2018-01-13 01:10:30 +04:00
Oleg Agafonov	36dcae63b3	For last fix	2018-01-12 21:28:10 +04:00
Oleg Agafonov	7c2511355e	Tests: added checks for errors on card loading (see #4402)	2018-01-12 21:10:10 +04:00
Zzooouhh	c6f623ea41	Added fungus counter	2018-01-12 16:40:53 +00:00
LevelX2	a63f87da2c	Little fix.	2018-01-12 17:04:51 +01:00
LevelX2	f798a25b3b	Added some mechanism that helps to prevent unintended changes to StaticFilters.	2018-01-12 15:27:52 +01:00
igoudt	267100d3d6	fix for #4402	2018-01-12 15:03:54 +01:00
Radoslaw Sypen	29a889b236	Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing	2018-01-12 10:42:50 +01:00
Radoslaw Sypen	88527987cc	Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger	2018-01-12 10:33:11 +01:00
Zzooouhh	ca46a8872a	Moved PermanentInListPredicate to common predicates	2018-01-11 17:53:32 +00:00
spjspj	ab4490e476	Merge pull request #4398 from spjspj/master ... Add 5 cards (UGL)	2018-01-12 00:06:39 +11:00
spjspj	d9bcfa3f31	Add 5 cards (UGL)	2018-01-11 23:55:37 +11:00
spjspj	8a1619f9b4	Merge pull request #4396 from spjspj/master ... Add 3 cards (UGL)	2018-01-11 17:56:55 +11:00
spjspj	96e6a917b4	Add 3 cards (UGL)	2018-01-11 17:43:33 +11:00
LevelX2	4c9ed95662	Xmage 1.4.26V11d	2018-01-11 07:14:49 +01:00
LevelX2	2685d9f8b4	Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox	2018-01-11 06:12:27 +01:00
Zzooouhh	a38ec84581	Removed slipped beta Blaze of Glory code ... in case it could break something, as it's still buggy	2018-01-10 19:49:15 +00:00
Zzooouhh	8f9356533d	Fixed undoing individual blocker declarations for multi-blockers ... One more #4172 fix	2018-01-10 19:44:48 +00:00
ciaccona007	470bb69a7e	Implement Timmy, Power Gamer	2018-01-09 14:14:34 -08:00
ciaccona007	3e87a50b4d	Implement Krazy Kow	2018-01-09 13:25:46 -08:00
ciaccona007	79c18d28e2	Implement Chicken Egg	2018-01-09 12:40:39 -08:00
LevelX2	fef0ef83ec	xmage 1.4.26V11c	2018-01-08 22:59:35 +01:00
Zzooouhh	1109d2b246	Made Changeling take effect in all zones ... Still doesn't fix Path of Ancestry interaction of Dr. Julius Jumblemorph though	2018-01-08 17:23:12 +00:00
SpikesCafe-google	645b4ac47b	Rename PermanentReflectionToken.java to PureReflectionToken.java	2018-01-07 20:59:00 -05:00
SpikesCafe-google	99b4b427f0	Create PermanentReflectionToken.java	2018-01-07 20:45:30 -05:00
igoudt	ec5b34be04	Merge branch 'master' of https://github.com/magefree/mage	2018-01-07 22:39:40 +01:00
igoudt	27ec3431ee	rewrite with staticfilter	2018-01-07 22:39:31 +01:00
igoudt	6d16e41ec3	use some staticfilters, rewrite some lines to java8 streams	2018-01-07 22:38:54 +01:00
LevelX2	995c58e381	* Reckless Rage - Fixed damge dealing to the creatures.	2018-01-07 22:11:12 +01:00
LevelX2	86857e2e0f	Merge origin/master	2018-01-07 18:05:23 +01:00
LevelX2	46bcad2ada	Mage 1.4.26V11	2018-01-07 18:04:59 +01:00
Zzooouhh	9c77a5db7a	Added currency counter	2018-01-07 16:13:34 +00:00
LevelX2	0e119ffa01	[RIX] Fixed set card [RIX] Added 5 cards.	2018-01-07 13:29:40 +01:00
LevelX2	3480d47d11	[RIX] Added 7 cards.	2018-01-07 10:54:15 +01:00
LevelX2	15081f7d0e	Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java	2018-01-07 02:41:49 +01:00
LevelX2	0f0b1d8330	[RIX] Added 8 cards.	2018-01-07 02:33:32 +01:00
Oleg Agafonov	70e99e185b	Updated menace and explore abilities to show or hide description	2018-01-07 03:46:07 +04:00
LevelX2	5935221878	[RIX] Added 6 cards.	2018-01-06 23:47:54 +01:00
LevelX2	b4f9cbd15c	[RIX] Added 5 cards.	2018-01-06 22:35:39 +01:00
LevelX2	4571ab8dce	[RIX] Added 5 cards.	2018-01-06 21:34:15 +01:00
LevelX2	803df371f9	[RIX] Added 4 cards.	2018-01-06 18:42:03 +01:00
LevelX2	488622662a	[RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet.	2018-01-06 17:24:00 +01:00
LevelX2	509648448e	[RIX] Added 2 cards.	2018-01-06 13:31:50 +01:00
LevelX2	7189cb868f	[RIX] Added 9 cards.	2018-01-06 12:40:25 +01:00
LevelX2	f95b0e6c0a	Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java	2018-01-05 23:41:30 +01:00
LevelX2	f0494383fd	[RIX] Added 4 cards.	2018-01-05 15:26:10 +01:00
Oleg Agafonov	bc75f82524	Fixed wrong ability texts with duplicated card name (see #4335)	2018-01-05 02:21:16 +04:00
LevelX2	145fe8ca15	[Rix] Added 5 cards.	2018-01-04 18:00:08 +01:00
Oleg Agafonov	56949414d1	Fixed wrong ability texts with duplicated card name (see #4335)	2018-01-04 20:48:41 +04:00
Oleg Agafonov	6b9db5eb17	[RIX] Added Deeproot Elite	2018-01-04 05:44:12 +04:00
Oleg Agafonov	3dda5712db	AI: fixed not working choice with key-value dialogs, random refactor	2018-01-04 00:23:20 +04:00
LevelX2	547c7078bf	[Rix] Added 6 cards.	2018-01-03 18:02:27 +01:00
LevelX2	32fb2507c3	Some rework to Framework.	2018-01-03 11:40:07 +01:00
Oleg Agafonov	1a252e61a2	Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH)	2018-01-03 09:10:39 +04:00
Oleg Agafonov	204a602b36	Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332)	2018-01-03 07:43:15 +04:00
LevelX2	02f6ce7639	Merge origin/master	2018-01-02 23:48:27 +01:00
LevelX2	bc490ef91a	Added Spellweaver Volute.	2018-01-02 23:48:07 +01:00
LevelX2	7d026c699f	[RIX] Added 3 cards.	2018-01-02 17:47:38 +01:00
LevelX2	70c08a2d81	* Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard (fixes #4315).	2018-01-02 15:01:58 +01:00
Zzooouhh	f201ec6fc0	Merge pull request #4326 from Zzooouhh/Zzooouhh-hml ... Implemented some Homelands cards	2018-01-02 09:11:46 +01:00
Zzooouhh	497ebebc05	Implemented Broken Visage	2018-01-02 05:52:47 +01:00
Zzooouhh	bde116e201	Implemented Autumn Willow	2018-01-02 05:48:06 +01:00
Zzooouhh	aa10e2d336	Implemented Autumn Willow	2018-01-02 05:46:33 +01:00
Zzooouhh	49aa22079f	Added net counter	2018-01-01 19:09:08 +01:00
igoudt	54c585afd8	fixes #4317	2017-12-31 22:24:03 +01:00
LevelX2	d87ce66347	Added Even the Odds and reworked Feast of Blood's cast restriction.	2017-12-31 12:55:21 +01:00
LevelX2	519eae42fc	* Fixed some problems with abilities that let permanents become artifact creatures but only added creature card type instead of artifact and creature card type (fixes #4290).	2017-12-31 11:31:58 +01:00
LevelX2	330c6f1393	XMage 1.4.26V10	2017-12-30 20:17:04 +01:00