github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 20:06:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
16049 commits 2 branches 0 tags 782 MiB
Commit graph

16049 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cg5
33e1e03288 Fix Aetherborn Marauder's ability 2016-09-18 16:07:21 +02:00
Dilnu
a2f3089913 Remove files about to be renamed to allow for merge. 2016-09-18 09:47:58 -04:00
spjspj
877c4ffa61 Merge pull request #2316 from cg5-/bug-fixes 
Fix bugs in Ninth Bridge Patrol and Renegade Freighter
 2016-09-18 23:23:24 +10:00
cg5
bf16b25f51 Fix bugs in Ninth Bridge Patrol and Renegade Freighter 2016-09-18 12:25:03 +02:00
spjspj
88b557e1b2 Merge pull request #2317 from spjspj/master 
Some minor fixes for grabbag
 2016-09-18 20:22:00 +10:00
spjspj
8cf4acb68a Some minor fixes. 2016-09-18 20:20:04 +10:00
LevelX2
e5466470ef * Select for Inspection - Fixed wrong casting costs (fixes #2315). 2016-09-18 09:07:20 +02:00
LevelX2
c971aea67d * Gonti, Lord of Luxury - Fixed a endless loop error. 2016-09-18 01:15:56 +02:00
LevelX2
844b36c7dc * Glimmer of Genius - Fixed the missing Instant card type. 2016-09-18 00:16:20 +02:00
LevelX2
f9789ee078 xmage 1.4.15v2 2016-09-17 20:43:39 +02:00
LevelX2
a1e70e21f4 [KLD] Some more fixes. 2016-09-17 20:18:54 +02:00
LevelX2
bf73eb4042 Merge pull request #2310 from fenhl/ae 
Change AE to Ae
 2016-09-17 19:04:42 +02:00
LevelX2
a6d72d4101 [KLD] Some more fixes. 2016-09-17 19:01:00 +02:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
346b6654f8 [KLD] Some minor fixes. 2016-09-17 18:17:01 +02:00
LevelX2
d9c804602e Merge origin/master 2016-09-17 17:01:29 +02:00
LevelX2
1d4d612501 [KLD] Some card names fixed. 2016-09-17 17:01:06 +02:00
spjspj
086ef80172 Merge pull request #2309 from spjspj/master 
spjspj - Fairgrounds Trumpeter (KLD)
 2016-09-18 00:46:22 +10:00
LevelX2
04ca15a3a9 Some minor fixes. 2016-09-17 16:45:53 +02:00
spjspj
7ccd05afd5 spjspj - Fairgrounds Trumpeter (KLD) 2016-09-18 00:45:35 +10:00
LevelX2
5d98324c82 Merge origin/master 2016-09-17 16:32:42 +02:00
LevelX2
9accd877a5 [KLD] Added 7 green and 1 multicolor card. 2016-09-17 16:32:17 +02:00
spjspj
9151199d7c Merge pull request #2308 from spjspj/master 
spjspj - Durable Handicraft(KLD)
 2016-09-18 00:07:12 +10:00
spjspj
73a6749dbc spjspj - Durable Handicraft(KLD) 2016-09-18 00:06:07 +10:00
LevelX2
4b768812f6 [KLD] Added 6 artifacts and 1 multicolor card. 2016-09-17 15:56:18 +02:00
spjspj
68be138d6b Merge pull request #2307 from spjspj/master 
spjspj - Deadlock Trap (KLD)
 2016-09-17 23:30:22 +10:00
spjspj
f891d66e92 spjspj - Deadlock Trap (KLD) 2016-09-17 23:29:24 +10:00
LevelX2
e7c5effa7f [KLD] Added 13 red cards. 2016-09-17 15:18:34 +02:00
LevelX2
c087296c05 Merge origin/master 2016-09-17 14:57:24 +02:00
spjspj
5b2052701f Merge pull request #2305 from spjspj/master 
spjspj - 1 kld card
 2016-09-17 22:40:09 +10:00