github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
19687 commits 2 branches 0 tags 782 MiB
Commit graph

11826 commits

Author SHA1 Message Date
LevelX2
cb15d4728d * Dragon Tempest - Fixed a problem if damage was redirected (e.g. with Spellskite) - (fixes #3887). 2017-08-27 14:27:03 +02:00
LevelX2
7e8dcef120 C17 added Seth's Tiger. 2017-08-27 10:57:14 +02:00
LevelX2
884b6919c4 * Bloodforge Battle-Axe (C17) - Fixed wrong card name renamed Bloodforge War Axe to Bloodforge Battle-Axe. 2017-08-27 10:14:46 +02:00
LevelX2
4f758d42b4 Merge origin/master 2017-08-27 08:07:45 +02:00
LevelX2
f35eee935c * XMage 1.4.26V2 2017-08-27 08:04:18 +02:00
Evan Kranzler
a8105e1c60 Fixed Extraplanar Lens implementation (#3510) 2017-08-26 20:21:56 -04:00
theelk801
22d253acd7 Merge pull request #43 from magefree/master 
merge
 2017-08-26 19:59:51 -04:00
Evan Kranzler
7dae1f394b Fixed bug #3497 2017-08-26 19:57:54 -04:00
LevelX2
58627bfcf6 * Vampire Hexmage - Fixed possible ConcurrentModificationException. 2017-08-26 13:33:44 +02:00
LevelX2
e7a3fee8d7 * Teferi's Protection - Fixed that the damage prevention and protection from did not work correctly (fixes #3879). 2017-08-26 13:24:41 +02:00
LevelX2
1641dd0c1f * Territorial Hellkite - Fixed null pointer exception and fixed opponent to attack logic. 2017-08-26 11:22:03 +02:00
LevelX2
cf7d718226 * Some minor changes. 2017-08-26 09:52:51 +02:00
Evan Kranzler
59d6835285 Implemented Psychic Trance 2017-08-25 15:26:12 -04:00
Evan Kranzler
f7d7cb26f5 Implemented Aphetto Vulture 2017-08-25 15:15:54 -04:00
Evan Kranzler
a025dd1176 fixed bug #3877 2017-08-25 10:28:53 -04:00
theelk801
ed9320362d Merge pull request #42 from magefree/master 
merge
 2017-08-25 10:14:03 -04:00
Evan Kranzler
6131234145 Implemented Oath of Mages and Oath of Ghouls, updated the rest of the cycle as well 2017-08-25 10:11:39 -04:00
spjspj
b7af1ee103 Merge pull request #3881 from spjspj/master 
Implement 4 cards (XLN)
 2017-08-25 22:17:04 +10:00
spjspj
0dcf939cf5 Implement 4 card (XLN) 2017-08-25 22:15:51 +10:00
Evan Kranzler
f6557035f5 Changed Oath of Druids to properly reflect its text 2017-08-24 20:28:16 -04:00
Evan Kranzler
358d496803 fixed bug #3279 2017-08-24 18:46:48 -04:00
LevelX2
de62867a5d * Collective Voyage - Undo mana payment if mana payment is canceled (fixes #3850). 2017-08-24 23:19:15 +02:00
LevelX2
04afe73f28 * Fixed that curses selected with Bitterheart Witch or Curse of Misfortunes could be retargeted (fixes #3858). 2017-08-24 16:08:58 +02:00
Evan Kranzler
b8b4eb3b46 fixed Mathas bounty trigger 2017-08-24 09:09:33 -04:00
Evan Kranzler
4cd34c2cc8 fixed bug #3274 2017-08-23 22:04:36 -04:00
Evan Kranzler
514993bd0f fixed bug #3768 2017-08-23 21:55:53 -04:00
Evan Kranzler
f1ba86f552 fixed bug #3873 2017-08-23 12:14:21 -04:00
Evan Kranzler
c6029176d3 Implemented Varchild's War Raiders 2017-08-23 10:52:58 -04:00
Evan Kranzler
22eca2f5cd Fixed bug #3871 2017-08-22 21:56:34 -04:00
Evan Kranzler
c61651da69 Fixed bug #3777 2017-08-22 21:44:14 -04:00
Evan Kranzler
6988688e64 Fixed Animal Magnetism putting card into hand instead of battlefield 2017-08-22 21:00:04 -04:00
Evan Kranzler
84fa5ae2a9 Implemented Defiant Vanguard 2017-08-22 20:18:40 -04:00
Evan Kranzler
8b6d2ffde8 Implemented Mind Bomb 2017-08-22 19:54:50 -04:00
Evan Kranzler
af5ac669bc Implemented Toxic Stench 2017-08-22 17:34:39 -04:00
Evan Kranzler
25cb9db4c9 Implemented Diabolic Vision 2017-08-22 15:39:39 -04:00
Evan Kranzler
1d9240a3b5 Implemented Darksteel Garrison 2017-08-22 14:19:28 -04:00
Evan Kranzler
e3faef4a52 Fixed several cards with ETB abilities that didn't use last known information properly 2017-08-22 13:35:44 -04:00
theelk801
778ec735de Merge pull request #40 from magefree/master 
merge
 2017-08-22 13:33:35 -04:00
LevelX2
4c2d8cd8f8 * Improved payment handling of conditional monohybrid colored mana. 2017-08-22 17:51:48 +02:00
Evan Kranzler
5aeef14429 Fixed bug #3865, also fixed a few other cards with the same issue. 2017-08-22 10:59:02 -04:00
LevelX2
24596e82a3 Merge origin/master 2017-08-22 15:32:32 +02:00
LevelX2
aa01ec979c * Karador Ghost Chieftain - Fixed possible null pointer exception. 2017-08-22 15:31:58 +02:00
theelk801
4d5e8d4a91 Merge branch 'master' into master 2017-08-22 09:31:16 -04:00
Evan Kranzler
8d85189262 Implemented Mairsil properly 2017-08-22 09:27:07 -04:00
LevelX2
2880b32444 * Vindictive Lich - Fixed cross mode target handling. 2017-08-22 00:27:18 +02:00
Jeff
7b1ba214e2 - Added Funeral Pyre. Fixed Orcish Settlers. 2017-08-21 16:24:15 -05:00
LevelX2
9ac7fe27f0 * Vindictive Lich (mode target handling not fixed yet). 2017-08-21 18:49:37 +02:00
Evan Kranzler
f33d9006c6 Implemented Mairsil but this is possibly game-breaking 2017-08-21 11:29:34 -04:00
Evan Kranzler
e0c48bfa4e Implemented Mairsil almost 2017-08-21 10:07:40 -04:00
theelk801
2f7c11bb49 Merge pull request #37 from magefree/master 
merge
 2017-08-20 16:29:06 -04:00
Evan Kranzler
8a537410dd Implemented Kjeldoran Frostbeast 2017-08-20 16:26:36 -04:00
Evan Kranzler
4984a624e1 Implemented Freyalise's Radiance 2017-08-20 16:19:50 -04:00
Evan Kranzler
0191f33094 Implemented Ventifact Bottle 2017-08-20 16:14:02 -04:00
Evan Kranzler
27967b1353 Implemented Remembrance 2017-08-20 15:49:34 -04:00
theelk801
7787f86b85 Merge pull request #3863 from theelk801/master 
Implemented Boneyard Scourge and Grenzo, Havoc Raiser, fixed bug #3853 and Ur-Dragon trigger bug
 2017-08-20 13:53:44 -04:00
Evan Kranzler
ebc9b728dd Implemented Grenzo, Havoc Raiser 2017-08-20 13:50:15 -04:00
Evan Kranzler
2861e5f86f fixed Ur-Dragon trigger 2017-08-20 12:00:12 -04:00
Evan Kranzler
2b5f5463e6 fixed bug #3853 2017-08-20 11:36:44 -04:00
Evan Kranzler
a2f25c76d9 Implemented Boneyard Scourge 2017-08-20 11:30:35 -04:00
theelk801
b065816450 Merge pull request #3849 from Eleros/commander2017 
Implemented Hammer of Nazahn, Heirloom Blade & Shifting Shadow
 2017-08-20 09:57:57 -04:00
theelk801
ecf899ca3e Merge pull request #36 from magefree/master 
merge
 2017-08-20 09:56:24 -04:00
Evan Kranzler
f4cdb77513 fixed bug #3857, recoded the C17 curses 2017-08-20 09:54:43 -04:00
spjspj
9323340478 Merge pull request #3860 from spjspj/master 
Slight fix for Karador and Gisa and Geralf
 2017-08-20 17:19:59 +10:00
spjspj
1d7ffa16d4 Slight fix for Karador and Gisa and Geralf 2017-08-20 17:18:17 +10:00
theelk801
eac2d31c88 Merge pull request #35 from magefree/master 
merge
 2017-08-19 09:29:56 -04:00
spjspj
57ab14801a Merge pull request #3855 from spjspj/master 
Implement Kess, Dissident Mage (C17)
 2017-08-19 22:34:04 +10:00
spjspj
484d4a688f Implement Kess, Dissident Mage (C17) 2017-08-19 22:33:11 +10:00
LevelX2
09511cc151 * Assembled Alphas - Fixed that the triggered ability did not work. 2017-08-19 08:41:05 +02:00
Evan Kranzler
7e9b6eff1e fixed bug #3852 2017-08-18 14:58:59 -04:00
Evan Kranzler
ca11f22580 fixed bug #3851 2017-08-18 14:51:22 -04:00
Saga\Robert
cc1911c9c4 - added Hammer of Nazahn 
- added Heirloom Blade
- added Shifting Shadow
- updated c17 set class
 2017-08-18 17:31:27 +02:00
Jeff
881822d404 - Fixed cost of Scalelord Reckoner. 2017-08-18 10:31:24 -05:00
Evan Kranzler
0820a0df59 Implemented Path of Ancestry 2017-08-18 09:37:51 -04:00
igoudt
b60a0ac006 add shuffle to Manipulate Fate 2017-08-18 11:35:41 +02:00
theelk801
4ae6784164 Merge pull request #3845 from theelk801/master 
fixed bugs #3842 and #3843
 2017-08-17 22:17:01 -04:00
Evan Kranzler
7aabca9339 Fixed bug #3843 2017-08-17 21:35:10 -04:00
Evan Kranzler
80713d8383 Fixed bug #3842 2017-08-17 21:32:28 -04:00
theelk801
b73a648cd9 Merge pull request #3841 from theelk801/master 
Implemented C17 - Licia, Sanguine Tribune and Mathas, Fiend Seeker
 2017-08-17 18:22:17 -04:00
Evan Kranzler
53a666a580 Implemented Mathas, Fiend Seeker 2017-08-17 18:18:44 -04:00
Evan Kranzler
f7e9c222af Implemented Licia, Sanguine Tribune 2017-08-17 17:05:34 -04:00
Jeff
557f08d4bc - Added requested card Minion Of Leshrac. 2017-08-17 15:29:04 -05:00
theelk801
b2270a7f10 Merge pull request #33 from magefree/master 
merge
 2017-08-17 15:55:26 -04:00
Evan Kranzler
a9b5e4065f Implemented Jeering Homunculus 2017-08-17 15:53:55 -04:00
Evan Kranzler
ede65b5c73 Implemented Goblin Racketeer 2017-08-17 15:51:18 -04:00
Evan Kranzler
e085e07be1 Implemented Besmirch and Coveted Peacock 2017-08-17 15:46:07 -04:00
LevelX2
db93e3f672 * C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds). 2017-08-17 21:36:55 +02:00
Evan Kranzler
87635cf1b9 Implemented Disrupt Decorum, implemented goading 2017-08-17 14:56:47 -04:00
LevelX2
0affb45264 * Curse of Opulence - Fixed a bug that could create game error (index out of bounds). 2017-08-17 20:35:36 +02:00
Jeff
9ea66fe3f9 - Added requested card Three Wishes. 2017-08-17 11:29:33 -05:00
Evan Kranzler
6a991d8f62 fixed issue #3837 2017-08-17 11:26:39 -04:00
theelk801
df02c32b0d Merge branch 'master' into c17KindredCycle 2017-08-17 11:13:44 -04:00
Evan Kranzler
126e456172 Implemented Izzet Chemister 2017-08-17 11:02:14 -04:00
Evan Kranzler
f6a06fd576 Implemented Magus of the Mind 2017-08-17 10:15:19 -04:00
Evan Kranzler
d2d6c635ac Implemented Kheru Mind-Eater 2017-08-17 09:44:30 -04:00
Evan Kranzler
636db342f2 Implemented Galecaster Colossus 2017-08-17 08:12:47 -04:00
Evan Kranzler
c776e0a0e1 Implemented Mirri, Weatherlight Duelist 2017-08-16 22:05:38 -04:00
Saga\Robert
2dc674b75c - added Kindred Boon, Charge, Discovery and Summons 
- updated c17 set class
 2017-08-17 00:22:14 +02:00
Evan Kranzler
76bac135dc Implemented Bloodline Necromancer 2017-08-16 13:58:35 -04:00
theelk801
46cff52f2b Merge pull request #3827 from theelk801/master 
Implemented Territorial Hellkite
 2017-08-16 13:00:23 -04:00
Evan Kranzler
ffc5c1c894 Implemented Territorial Hellkite 2017-08-16 12:57:48 -04:00
spjspj
2f6c52f93a Implement Fortunate Few (C17) 2017-08-17 00:34:17 +10:00
Evan Kranzler
c6b2ccec86 minor change to C17 file 2017-08-16 08:44:53 -04:00
Evan Kranzler
dd41b53859 Implemented Mirror of the Forebears 2017-08-16 08:38:35 -04:00
Evan Kranzler
9c3938157f Fixed Nemesis of Mortals, modified Loreseeker's Stone (bug #3823) 2017-08-16 07:58:36 -04:00
Evan Kranzler
5b736912b4 Implemented Bloodforged War Axe 2017-08-15 21:18:11 -04:00
Evan Kranzler
372c32ef64 Implemented Arahbo, Roar of the World 2017-08-15 20:11:59 -04:00
Evan Kranzler
2eb2bec5f0 Implemented Inalla, Archmage Ritualist 2017-08-15 18:41:44 -04:00
Evan Kranzler
341094dc00 Implemented Edgar Markov 2017-08-15 18:08:33 -04:00
theelk801
39bbd977e1 Merge branch 'master' into master 2017-08-15 16:13:19 -04:00
Evan Kranzler
57d6a1d995 Implemented The Ur-Dragon, added Eminence as an ability word 2017-08-15 16:03:34 -04:00
Saga\Robert
81a7c76374 - fixed Kindred Dominance bug (was using Wasitora class) 
- sorted c17 set file alphabetically
 2017-08-15 17:21:40 +02:00
Evan Kranzler
5d8d0f9d9d Small change to Afiya Grove 2017-08-15 09:49:53 -04:00
Evan Kranzler
0b691cc97b Implemented Air Bladder 2017-08-15 09:27:32 -04:00
Evan Kranzler
110b237b58 Implemented Afiya Grove 2017-08-15 09:20:16 -04:00
Evan Kranzler
f2480ff5ca Implemented Aether Storm 2017-08-15 09:01:25 -04:00
LevelX2
6c9a6ab58a * Ulvenwald Tracker - Fixed rule text. 2017-08-15 12:49:10 +02:00
LevelX2
fc2ea909b6 * Earthshaker Khenra - Fixed that the power comparison was until now not done during resolution. 2017-08-15 08:31:52 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
LevelX2
5cf3e4ed12 Some minor changes. 2017-08-15 00:32:53 +02:00
theelk801
ee3d36f2cd Merge pull request #26 from magefree/master 
merge
 2017-08-14 17:35:16 -04:00
LevelX2
928427c6a2 Merge pull request #3811 from theelk801/master 
Implemented Complex Automaton, Consuming Ferocity, Crash Landing, Credit Voucher, Crookclaw Elder, Crooked Scales, Dark Triumph, and Deathmark Prelate
 2017-08-14 23:13:05 +02:00
LevelX2
4b8e9c1525 Merge pull request #3810 from Eleros/C17 
Implemented C17 Curse cycle
 2017-08-14 23:10:52 +02:00
Christian
06806b6f64 Fixed typo in Kindred Dominance 2017-08-14 16:52:32 -04:00
Christian
214a585f8d Fixed merge conflicts 2017-08-14 16:13:35 -04:00
Christian
75712661de Updated Kindred Dominance with better code reuse 2017-08-14 16:08:35 -04:00
Christian
98ee5931a7 Implemented Kindred Dominance and added to Commander2017 Set 2017-08-14 15:57:43 -04:00
Evan Kranzler
c9be694f05 Fixed Credit Voucher 2017-08-14 15:54:24 -04:00
Christian
4838ad7e7a Added Kindred Dominance to Commander 2017 Set 2017-08-14 15:22:01 -04:00
Evan Kranzler
cb34678c70 Fixed Crooked Scales, Consuming Ferocity, Crash Landing and Crookclaw Elder 2017-08-14 13:12:32 -04:00
Saga\Robert
1f759f9291 - changed getPermanent to getPermanentOrLKIBattlefield 
- changed == operator to equals()
 2017-08-14 17:17:10 +02:00
spjspj
f2c89d4717 Merge pull request #3812 from spjspj/master 
Implement Fractured Identity (C17)
 2017-08-15 01:05:46 +10:00
spjspj
41eff642ba Implement Fractured Identity (C17) 2017-08-15 01:04:25 +10:00
LevelX2
6244046330 * Some minor changes. 2017-08-14 16:48:48 +02:00
Saga\Robert
8b427de2d3 - changed nonland filter to static filter 2017-08-14 15:15:36 +02:00
Evan Kranzler
60d3fb62ba Fixed bug #3797 2017-08-13 22:35:41 -04:00
Evan Kranzler
d6896984c1 Implemented Daru Healer, Daughter of Autumn, Daunting Defender, Delraich, Dermoplasm, Disempower and Divine Congregation 2017-08-13 22:25:15 -04:00
theelk801
83dbc70ff0 Merge pull request #24 from magefree/master 
merge
 2017-08-13 17:55:08 -04:00
theelk801
ab280682cc Merge pull request #23 from theelk801/morecrads 
merge
 2017-08-13 17:53:02 -04:00
Saga\Robert
e0bbe2da7e - fixed it so controller doesn't get benefit twice if attacking 2017-08-13 20:19:33 +02:00
Saga\Robert
478a0b8ea8 - updated available set info of Zombie and Gold tokens 
- added Curse of Vitality
- added Curse of Verbosity
- added Curse of Disturbance
- added Curse of Opulence
- added Curse of Bounty
- added Curse cycle to C17
 2017-08-13 17:52:48 +02:00
LevelX2
1694daa4ab Merge pull request #3801 from theelk801/master 
Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm
 2017-08-13 16:28:10 +02:00
LevelX2
30ec306489 Merge branch 'master' into master 2017-08-13 16:26:17 +02:00
igoudt
195bf90889 Merge https://github.com/magefree/mage 2017-08-13 15:54:12 +02:00
igoudt
f658765722 fixes #3806 2017-08-13 15:53:39 +02:00
spjspj
ae95bd6e16 Fix 2017-08-13 23:06:17 +10:00
spjspj
cf95e5fa08 Merge branch 'master' of https://github.com/spjspj/mage 
Conflicts:
	Mage.Sets/src/mage/sets/Commander2017.java
 2017-08-13 23:04:01 +10:00
spjspj
a39ceae9a1 Implement Crimson Honor Guard (C17) 2017-08-13 22:59:45 +10:00
Saga
3ad7c71b42 Update HungryLynx.java 2017-08-13 14:37:48 +02:00
Christian
df07c7fa0c Created Kindred Dominance 2017-08-12 20:54:53 -04:00
Saga\Robert
ce0dded9ca - removed unused imports 2017-08-13 00:24:27 +02:00