Commit graph

16029 commits

Author SHA1 Message Date
Derek M
c05975f7eb Merge pull request #2344 from Fr33dan/master
Update EraOfInnovation.java
2016-09-21 08:52:44 -04:00
Derek M
b6d8f3ca10 Merge pull request #2345 from maxlebedev/master
Prelate now shows the chosen number
2016-09-21 08:52:31 -04:00
LevelX2
c82d6b5566 * Fixed some possible null pointer exceptions. 2016-09-20 23:40:25 +02:00
Max Lebedev
493cf1e3e6 removed an extra word from rules text 2016-09-20 14:57:37 -04:00
Styxo
ab6112f0a0 Added Silvergill Douser 2016-09-20 17:12:19 +02:00
emerald000
ab352100f1 Fixed Panharmonicon triggering for non-permanents. 2016-09-20 09:34:36 -04:00
Max Lebedev
5b35c5e9d5 Added Curfew 2016-09-20 05:42:29 -04:00
Max Lebedev
781fff2169 Added Psychotic Episode 2016-09-20 04:54:35 -04:00
Max Lebedev
85fd7bbea2 Prelate now shows the chosen number 2016-09-20 02:57:59 -04:00
Fr33dan
9cec1aa54b Update EraOfInnovation.java
Card triggered for all creatures when it should only trigger for Artificers
2016-09-20 01:05:06 -04:00
Styxo
da9fd5875c Merge pull request #2340 from Styxo/master
Added Blessed Wind and few refactors
2016-09-20 00:24:01 +02:00
Styxo
8485df8cb7 Added Blessed Wind and few refactors 2016-09-20 00:17:56 +02:00
spjspj
f431f75907 Merge pull request #2337 from spjspj/master
spjspj - Add 'Delayed Submit' button to the deck editor
2016-09-20 01:52:44 +10:00
spjspj
e22184180d spjspj - Add 'Delayed Submit' button to the deck editor 2016-09-20 01:49:51 +10:00
spjspj
0a8bb10068 Merge pull request #2335 from spjspj/master
spjspj - Fix for if Combustible Gearhulk dies prior to trigger resolv…
2016-09-19 23:44:34 +10:00
spjspj
a4195b2bb0 spjspj - Fix for if Combustible Gearhulk dies prior to trigger resolving KLD 2016-09-19 23:42:43 +10:00
emerald000
120d7612f6 Fixed Panharmonicon triggering for opponents abilities. Added tests. 2016-09-19 09:22:21 -04:00
LevelX2
b89822a655 * Inventer's Google - Fixed wrong parameters. 2016-09-19 11:22:50 +02:00
LevelX2
50c2b52d73 * Spark of Creativity - Fixed the missing target definition. 2016-09-19 11:18:49 +02:00
LevelX2
bdede18156 Merge origin/master 2016-09-19 09:41:03 +02:00
LevelX2
5263d1336d xmage 1.4.15v4 2016-09-19 09:40:19 +02:00
LevelX2
43f1cd929a Merge pull request #2332 from brodee/master
Fixed: Inventor's Goggle was triggering for opponent's creatures. it shouldn't
2016-09-19 09:30:17 +02:00
brodee
dba0f14591 Fixed: Inventor's Goggle was triggering for opponent's creatures. it shouldn't 2016-09-18 23:24:51 -07:00
LevelX2
95a641d08b Merge pull request #2327 from brodee/master
Capture by the consolate incorrectly prevented creatures from blocking.
2016-09-19 07:15:36 +02:00
LevelX2
8f836f8cda Merge pull request #2318 from cg5-/aetherborn-marauder-fix
Fix Aetherborn Marauder's ETB ability
2016-09-19 07:13:50 +02:00
Samuel Sandeen
5d4cd39142 Merge pull request #2329 from Dilnu/master
Fix the Snapcaster Mage X cost tests.
2016-09-18 20:23:49 -04:00
Dilnu
4427121a64 Fix the Snapcaster Mage Repeal Test
The flashback ability was attempting to choose targets. That doesn’t
really make sense since the Targets should be chosen by the actual
spell being cast.
2016-09-18 20:20:29 -04:00
Dilnu
2cab391d74 Fix a typo that broke the Snapcaster Blaze Test 2016-09-18 20:17:18 -04:00
Dilnu
41c1540f45 Fix a couple typos 2016-09-18 20:16:56 -04:00
brodee
7b336e3a0b Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:44:46 -07:00
brodee
94fa24813b Merge branch 'master' of https://github.com/brodee/mage 2016-09-18 15:41:18 -07:00
brodee
d01e8303e8 Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:37:43 -07:00
brodee
b5d965d9ba Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:35:56 -07:00
brodee
16e82ac582 Capture by the consolate incorrectly prevented creatures from blocking. 2016-09-18 15:28:28 -07:00
Dilnu
8d3e088b22 Merge branch 'magefree/master' 2016-09-18 17:17:54 -04:00
LevelX2
ea38924b5a Merge pull request #2325 from Dilnu/master
Fix the combat code to support Slayer's Cleaver
2016-09-18 22:51:27 +02:00
Dilnu
87a6d3a1ee Fix the combat code to support Slayer's Cleaver
Update the checks for unfulfilled conditions to confirm the blocking
creatures actually are fulfilled.
Update the check for whether a blocker is already being used correctly
to confirm that there isn’t a stricter condition that is unfulfilled.

This change also updates the Slayer’s Cleaver test to make it more
robust.
2016-09-18 16:28:01 -04:00
LevelX2
0702571be8 * Eddytrail Hawk - Fixed that the triggered ability was not optional. 2016-09-18 22:26:41 +02:00
LevelX2
2788bb9a17 * Start Your Engines - Fixed that the second effect did not work for vehicles animated by the first effect. 2016-09-18 20:12:01 +02:00
LevelX2
2c60990e46 * Revolutionary Rebuff - Fixed that the ommit of artifact spells did not work. 2016-09-18 18:21:16 +02:00
LevelX2
053fec43d7 * Janjeet Sentry - Fixed the missing target of the activated ability. 2016-09-18 18:17:07 +02:00
LevelX2
143f347d4e * Nature's Way - Fixed that the damage was not dealt. 2016-09-18 18:13:30 +02:00
LevelX2
03f14a0e2f * Take Down - Fixed that the first mode could also target creatures without flying. 2016-09-18 18:04:50 +02:00
LevelX2
332586e5b8 * Eddytrail Hawk - Fixed that instead of flying wrongly indestructible was given. 2016-09-18 18:00:47 +02:00
Dilnu
6ef1018f6f Merge remote-tracking branch 'origin/master' 2016-09-18 11:55:02 -04:00
spjspj
44d9836be9 Merge pull request #2322 from spjspj/master
KLD fixes - paradoxical outcome + bad forest
2016-09-19 00:51:07 +10:00
Dilnu
6ddbf5b560 Revert "Remove files about to be renamed to allow for merge."
This reverts commit a2f3089913.
2016-09-18 10:50:41 -04:00
spjspj
e9d2d48459 Wrong collector ID 2016-09-19 00:49:21 +10:00
spjspj
a5e6bf6896 Some minor fixes. 2016-09-19 00:45:18 +10:00
Get
ed7378da66 Player Panel UI redesign (new icons, new colors, new buttons) 2016-09-18 17:10:54 +03:00