45146 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hans Mackowiak	99c0f0a939	CountersRemove: fix ConcurrentModificationException when removing all counters	2020-08-01 12:46:47 +02:00
Michael Kamensky	50193447f9	Revert "Merge branch '2xm' into 'master'" ... This reverts commit 2f71beb001.	2020-07-31 20:54:51 +02:00
Michael Kamensky	2f71beb001	Merge branch '2xm' into 'master' ... Initial Double Masters support See merge request core-developers/forge!3040	2020-07-31 18:53:02 +00:00
Churrufli	e7fadd4397	Adding Current Brawl Metagame ... Adding Current Brawl Metagame	2020-07-31 20:49:53 +02:00
Churrufli	fc3ca506d5	Merge remote-tracking branch 'Developers/master'	2020-07-31 19:32:32 +02:00
Northmoc	2e844843a1	Initial Double Masters support	2020-07-31 09:11:26 -04:00
Michael Kamensky	bb63bcfeb7	Merge branch 'TriggerAttackerBlockedOnce' into 'master' ... Trigger: AttackerBlockedOnce for Neyith See merge request core-developers/forge!3039	2020-07-31 06:26:56 +00:00
Hans Mackowiak	419d827ad0	Trigger: AttackerBlockedOnce for Neyith	2020-07-31 07:28:59 +02:00
swordshine	1aa091bdf6	Merge branch 'branchingfix' into 'master' ... branching_evolution.txt R:Event wrong param fix Closes #1532 See merge request core-developers/forge!3038	2020-07-29 12:28:31 +00:00
Northmoc	0c10cfc510	branching_evolution.txt R:Event wrong param fix	2020-07-29 07:31:32 -04:00
swordshine	c00b1eebbc	Merge branch 'see_bottom' into 'master' ... see_the_truth.txt - rest go to bottom of library See merge request core-developers/forge!3037	2020-07-29 03:55:28 +00:00
Northmoc	249e4aa5ba	see_the_truth.txt - rest go to bottom of library	2020-07-28 23:02:24 -04:00
Michael Kamensky	67603dc6ed	Merge branch 'giantopp' into 'master' ... Better - giant_opportunity.txt with ConditionDefined$ RememberedLKI See merge request core-developers/forge!3036	2020-07-28 04:44:00 +00:00
Northmoc	8aa64ee280	giant_opportunity.txt with ConditionDefined$ RememberedLKI	2020-07-27 19:05:49 -04:00
Michael Kamensky	4054cb6431	Merge branch 'giantopp' into 'master' ... giant_opportunity.txt with RememberedLKI Closes #1526 See merge request core-developers/forge!3035	2020-07-27 20:25:19 +00:00
Northmoc	9fc57f8ed5	giant_opportunity.txt with RememberedLKI	2020-07-27 13:39:30 -04:00
Michael Kamensky	4a1fc9cbc2	Merge branch 'master' into 'master' ... Fixing Possibility Storm - War of the Spark #00 (Card Preview Puzzle), Tishana... See merge request core-developers/forge!3034	2020-07-27 03:32:28 +00:00
Nigol	8883c7dbb3	Fixing Possibility Storm - War of the Spark #00 (Card Preview Puzzle), Tishana should not be in the graveyard, and the 4 cards should be in the aihand not the library	2020-07-26 18:44:18 -04:00
Michael Kamensky	f2b4f0fd7b	Merge branch 'master' into 'master' ... Fix NPE in CostPartWithList (will need further rework / generalization later) See merge request core-developers/forge!3033	2020-07-26 16:43:40 +00:00
Agetian	55a10bccb7	- Fix NPE in CostPartWithList	2020-07-26 19:36:50 +03:00
Michael Kamensky	47e683b855	Merge branch 'patch-9' into 'master' ... Update net-decks.txt adding Current Penny Dreadful Metagame See merge request core-developers/forge!3032	2020-07-25 14:21:49 +00:00
Churrufli	7845383790	Update net-decks.txt adding Current Penny Dreadful Metagame	2020-07-25 07:14:23 +00:00
Michael Kamensky	b8beecbc49	Merge branch 'patch-8' into 'master' ... Update net-decks.txt See merge request core-developers/forge!3031	2020-07-24 16:15:29 +00:00
Churrufli	c2d67a3550	Update net-decks.txt ... Removed current MTGA Decks (that information is no longer available) added Current Historic Metagame (updated in the server) Pioneer as a Metagame (not as "Decks")	2020-07-24 12:07:20 +00:00
Michael Kamensky	c1bbef9b3a	Merge branch 'fights-once' into 'master' ... Add Neyith of the Dire Hunt (with the triggers support) See merge request core-developers/forge!3030	2020-07-23 19:50:46 +00:00
Agetian	335ea61822	- Combat can't be null for the BlockersDeclared trigger (hopefully, anyway).	2020-07-23 18:37:43 +03:00
Agetian	7db9a7b86c	- Rewrite FightOnce trigger to use a list. ... - Add support to test for a valid blocked attacker in TriggerBlockersDeclared. - Add Neyith of the Dire Hunt.	2020-07-23 18:34:19 +03:00
Michael Kamensky	3bc492f409	Merge branch 'jushi' into 'master' ... fix Kamigawa flip card See merge request core-developers/forge!3029	2020-07-23 15:02:03 +00:00
Agetian	ad4123c651	- "Whenever one or more .... fights" (e.g. Neyith)	2020-07-23 17:44:55 +03:00
Northmoc	beb34500aa	fix Kamigawa flip card	2020-07-23 10:02:23 -04:00
Michael Kamensky	78a303e4df	Merge branch 'master' into 'master' ... Simple Revenge of Ravens combat AI See merge request core-developers/forge!3028	2020-07-23 06:52:10 +00:00
Agetian	266fcd392d	- Tweak the values for the algorithm a bit.	2020-07-23 09:44:37 +03:00
Agetian	3c23144faf	- Account for possible life loss scenarios.	2020-07-23 09:42:41 +03:00
Agetian	8269d13b0f	- Simple Revenge of Ravens combat AI	2020-07-23 09:14:34 +03:00
swordshine	e5cee55c6a	Merge branch 'historic' into 'master' ... update Historic legal sets See merge request core-developers/forge!3027	2020-07-23 01:13:23 +00:00
Northmoc	93c74ed8b0	update Historic legal sets	2020-07-22 20:04:21 -04:00
Michael Kamensky	b8130c7dc1	Merge branch 'cardfactoryCleanup' into 'master' ... Cardfactory cleanup See merge request core-developers/forge!3024	2020-07-22 14:32:26 +00:00
Hans Mackowiak	f830c3a6b8	Cardfactory cleanup	2020-07-22 14:32:25 +00:00
Michael Kamensky	cc074f6b9f	Merge branch 'jmpmigrate' into 'master' ... migrate JMP See merge request core-developers/forge!3026	2020-07-22 14:16:31 +00:00
Northmoc	2166bfa9fb	migrate JMP	2020-07-22 10:07:22 -04:00
Michael Kamensky	006e3303b7	Merge branch 'master' into 'master' ... Attempting to fix the {C} payment while not breaking the "pay with any color" mechanic + Fix Vraska achievement. Closes #1510 and #1518 See merge request core-developers/forge!3025	2020-07-22 11:01:33 +00:00
Agetian	579f96498e	- Allow emblems to serve as registrable alt win conditions for the purpose of achievements. Fixed Vraska, Golgari Queen alt win achievement.	2020-07-22 13:47:20 +03:00
Agetian	39ca80652d	- Yet another attempt at the fix.	2020-07-22 13:32:18 +03:00
Agetian	093c4f8c11	Revert "- Attempt to both fix the {C} mana payment *and* not break the "may pay with mana of any color" at once", doesn't work.	2020-07-22 13:13:55 +03:00
Agetian	aae476f787	- Attempt to both fix the {C} mana payment *and* not break the "may pay with mana of any color" at once	2020-07-22 13:11:10 +03:00
Michael Kamensky	a162b250e0	Merge branch 'brawl' into 'master' ... add M21 to Brawl format See merge request core-developers/forge!3022	2020-07-22 04:17:14 +00:00
Michael Kamensky	8e7b76565d	Merge branch 'phantasmalAI' into 'master' ... phantasmal_image.txt add NeedsToPlay See merge request core-developers/forge!3023	2020-07-22 04:17:11 +00:00
Northmoc	a4c498137b	phantasmal_image.txt add NeedsToPlay	2020-07-21 16:40:09 -04:00
Northmoc	033022ccbc	add M21	2020-07-21 16:39:40 -04:00
Michael Kamensky	79030d5d55	Merge branch 'master' into 'master' ... AILogic for the other Omens See merge request core-developers/forge!3021	2020-07-21 16:44:50 +00:00