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

13641 commits

Author SHA1 Message Date
spjspj
c060f10287
Merge pull request #4392 from spjspj/master 
Add Jack-in-the-Mox + Jumbo Imp (UGL)
 2018-01-11 17:16:19 +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
56c615a66f
Prohibit fix 2018-01-10 18:09:09 +00:00
Administrator
4f38939fc1 - Fixed Pride of Conquerors. 2018-01-10 11:56:51 -06:00
spjspj
da69ee8816 Add Chicken a la King (UGL) 2018-01-11 00:12:05 +11:00
spjspj
9598ffa16b Add Jack-in-the-Mox + Jumbo Imp (UGL) 2018-01-10 20:02:37 +11:00
ciaccona007
c7c8ee390d Fix RIX land rarity 2018-01-09 19:13:00 -08:00
ciaccona007
77d90c5997 Implement Poultrygeist 2018-01-09 16:25:20 -08:00
ciaccona007
470bb69a7e Implement Timmy, Power Gamer 2018-01-09 14:14:34 -08:00
ciaccona007
5db12db371 Implement Growth Spurt 2018-01-09 13:58:23 -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
Achilles
b353a25f57 - Fixed Remembrance. 2018-01-08 21:19:15 -06:00
Achilles
1a2e44ef20 - Fixed Rimefeather Owl. 2018-01-08 20:18:25 -06:00
igoudt
b7b0310969 fixes #4380 2018-01-09 00:07:06 +01:00
LevelX2
fef0ef83ec xmage 1.4.26V11c 2018-01-08 22:59:35 +01:00
LevelX2
121c0ff894 * Angrath, the Flame-Chained - Fixed that it's -3 ability did sac with conv. mana cost of >= 3 instead of <= 3. 2018-01-08 22:59:18 +01:00
LevelX2
884b3ee492
Merge pull request #4370 from mathieupouedras/master 
Implements Brood of Cockroaches
 2018-01-08 19:03:08 +01:00
Zzooouhh
6769630308
Fixed ClassCastException for Baron Von Count 2018-01-08 17:00:08 +00:00
LevelX2
9258621bf1 * Dead Man's - Fixed that cards were exiled from controllers lib instead of enchanted objects owner library (fixes #4374). 2018-01-08 17:11:43 +01:00
Mathieu Pouedras
0fe65e99fa replace the name of the card with {this} for effect text 2018-01-08 12:04:56 +01:00
LevelX2
f3a37553a5 * Temple Altisaur - Fixed that the prevention effect was applied to all creatures, not just Dinosaurs (fixes #4364). 2018-01-08 10:52:03 +01:00
Mathieu Pouedras
096f2c0e51 Implements Brood of Cockroaches 2018-01-08 10:35:27 +01:00
Oleg Agafonov
ea99c7fb72 * Voracious Vampire - Fixed missing ability text 2018-01-08 10:24:26 +04:00
Oleg Agafonov
f7b562a976 * Tilonalli's Crown - Fixed typo in the card name 2018-01-08 10:17:36 +04:00
Oleg Agafonov
daf95cda51 * Release to the Wind - Fixed wrong card name Return to the Wind 2018-01-08 10:15:08 +04:00
Oleg Agafonov
eb7166aa2f * Pirate's Pillage - Fixed wrong random discard (see #4365) 2018-01-08 09:57:09 +04:00
SpikesCafe-google
f67e2e63a9
Create PureReflection.java 2018-01-07 20:44:29 -05:00
SpikesCafe-google
f38d3be4df
Implement "Pure Reflection" card from Invasion. 2018-01-07 20:42:56 -05:00
igoudt
ec675bfb53 Merge branch 'master' of https://github.com/magefree/mage 2018-01-07 22:56:19 +01:00
Oleg Agafonov
cd437ce8b8 * Raging Regisaur - Fixed wrong stats and text (see #4358) 2018-01-08 01:51:49 +04:00
igoudt
ec5b34be04 Merge branch 'master' of https://github.com/magefree/mage 2018-01-07 22:39:40 +01:00
igoudt
6d16e41ec3 use some staticfilters, rewrite some lines to java8 streams 2018-01-07 22:38:54 +01:00
LevelX2
6de177f8ac * Order of Succession - Fixed possible exception error. 2018-01-07 22:23:41 +01:00
LevelX2
423e3847a8 * Oathsworn Vampire - Fixed a possible exception bug. 2018-01-07 22:19:46 +01:00
LevelX2
b089a8a872 Merge origin/master 2018-01-07 22:12:16 +01:00
LevelX2
8b35f38efa * Warkite Marauder - Fixed wrong defender target handling (fixes #4354). 2018-01-07 22:11:59 +01:00
LevelX2
995c58e381 * Reckless Rage - Fixed damge dealing to the creatures. 2018-01-07 22:11:12 +01:00
Oleg Agafonov
13c8627bf1 [RIX] Kumena, Tyrant of Orazca - full fix 2018-01-08 00:49:24 +04:00
Oleg Agafonov
47fc1b5845 [RIX] Kumena, Tyrant of Orazca - fixed than it place counter to all cards instead merfolk 2018-01-08 00:36:40 +04:00
Oleg Agafonov
c07e3d327c Fixed wrong images download for two side cards (clean cards*.db and images needed) 2018-01-07 22:29:37 +04:00
LevelX2
86857e2e0f Merge origin/master 2018-01-07 18:05:23 +01:00
LevelX2
8afcc63b84 [RIX] Some minor fixes 2018-01-07 18:03:37 +01:00
Zzooouhh
e4f113c035
Implemented Trade Caravan and Truce 2018-01-07 16:41:06 +00:00
Zzooouhh
0faf22455a
Implemented Indentured Djinn 2018-01-07 16:40:17 +00:00
Zzooouhh
de46891d74
Implemented Indenttured Djinn 2018-01-07 16:38:12 +00:00
Zzooouhh
f1bea8ee4c
Implemented Indentured Djinn 2018-01-07 16:36:32 +00:00
Zzooouhh
a3e33b7d3f
Implemented Truce 2018-01-07 16:35:29 +00:00
Zzooouhh
ba8843115b
Implemented Trade Caravan 2018-01-07 16:34:12 +00:00
LevelX2
682de367a0 [RIX] Added Angrath, the Flame-Chained. Set complete! 2018-01-07 15:50:19 +01:00
LevelX2
4898c75bbd [RIX] Added 2 cards. 2018-01-07 15:19:18 +01:00
LevelX2
ca11def714 [RIX] Added 3 cards. 2018-01-07 15:05:27 +01:00
LevelX2
690c04f5fc [RIX] Added 3 cards. 2018-01-07 15:05:20 +01:00
Zzooouhh
590717c12e
[RIX] Added 4 cards 2018-01-07 13:38:08 +00:00
Zzooouhh
1459d8fc90
Implemented Buccaneer's Bravado 2018-01-07 13:34:25 +00:00
Zzooouhh
67f964160b
Implemented Brazen Freebooter 2018-01-07 13:32:00 +00:00
Zzooouhh
275cd90439
Implemented Aquatic Incursion 2018-01-07 13:31:27 +00:00
Zzooouhh
7f4d9087aa
Implemented Azor, the Lawbringer 2018-01-07 13:30:33 +00:00
LevelX2
0e119ffa01 [RIX] Fixed set card [RIX] Added 5 cards. 2018-01-07 13:29:40 +01:00
LevelX2
e997022de6 [RIX] Fixed set card [RIX] Added 7 cards. 2018-01-07 12:25:46 +01:00
LevelX2
fafc94d4d6 [RIX] Fixed set card list. 2018-01-07 10:57: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
4255a57528 Cleanup 2018-01-07 05:02:05 +04:00
Oleg Agafonov
cae20c1a3f [RIX] Added Swaggering Corsair 2018-01-07 04:58:02 +04:00
Will Hall
72844741da Added Human type to Daring Buccaneer. 2018-01-06 16:29:48 -08:00
Oleg Agafonov
3e7c5aee9c typos 2018-01-07 04:09:52 +04:00
Oleg Agafonov
5bcb93bec1 typos 2018-01-07 04:08:27 +04:00
Oleg Agafonov
d1463d08e4
Merge branch 'master' into master 2018-01-07 04:04:47 +04:00
Oleg Agafonov
f185138fa3 [RIX] Fixed duplicated Profane Procession and card number 2018-01-07 03:59:26 +04:00
Oleg Agafonov
7df0d81ea1 [RIX] Added 6 cards 2018-01-07 03:46:28 +04:00
Will Hall
0fe8e28e5c Implemented Grasping Scoundrel. 2018-01-06 15:21:41 -08:00
LevelX2
096d020c94
Merge pull request #4346 from use/master 
Implemented Daring Buccaneer.
 2018-01-06 23:48:59 +01:00
LevelX2
5935221878 [RIX] Added 6 cards. 2018-01-06 23:47:54 +01:00
Will Hall
5437c0ef2a Implemented Daring Buccaneer. 2018-01-06 13:55:33 -08: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
80c0107434 [RIX] Added 5 cards. 2018-01-06 18:55:44 +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
d0fd325bfa Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-06 12:48:46 +01:00
LevelX2
f66834fc19 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-06 12:48:35 +01:00
LevelX2
7189cb868f [RIX] Added 9 cards. 2018-01-06 12:40:25 +01:00
Zzooouhh
e4f798c8d0
[RIX] Added 24 cards 2018-01-06 10:53:20 +00:00
Zzooouhh
722dee7b97
Implemented Vampire Revenant 2018-01-06 10:52:26 +00:00
Zzooouhh
9a9a2dda72
Implemented Sworn Guardian 2018-01-06 10:51:53 +00:00
Zzooouhh
a37b32b879
Implemented Sun Sentinel 2018-01-06 10:51:15 +00:00
Zzooouhh
1cdb598944
Implemented Silverclad Ferocidons 2018-01-06 10:50:40 +00:00
Zzooouhh
1d51c537c7
Implemented Reaver Ambush 2018-01-06 10:49:58 +00:00
Zzooouhh
c8650e8af4
Implemented Ravenous Chupacabra 2018-01-06 10:49:30 +00:00
Zzooouhh
c61dc16ff6
Implemented Raging Regisaur 2018-01-06 10:48:51 +00:00
Zzooouhh
1cd6c1711e
Implemented Orazca Raptor 2018-01-06 10:47:47 +00:00
Zzooouhh
9f0f7a1dae
Needletooth Raptor text fix 2018-01-06 10:47:04 +00:00
Zzooouhh
8dcd37d761
Implemented Needletooth Raptor 2018-01-06 10:46:17 +00:00
Zzooouhh
cb1773f24f
Implemented Moment of Triumph 2018-01-06 10:45:46 +00:00
Zzooouhh
4a0f6d1aa8
Implemented Moment of Craving 2018-01-06 10:45:20 +00:00
Zzooouhh
5d6297c394
Implemented Mist-Cloaked Herald 2018-01-06 10:44:56 +00:00
Zzooouhh
9c20ae6a57
Implemented Mastermind's Acquisition 2018-01-06 10:44:22 +00:00
Zzooouhh
13acbef5cb
Implemented Martyr of Dusk 2018-01-06 10:43:55 +00:00
Zzooouhh
02bf60f1d7
Implemented Majestic Heliopterus 2018-01-06 10:43:22 +00:00
Zzooouhh
5228aab9ca
Implemented Imperial Ceratops 2018-01-06 10:42:55 +00:00
Zzooouhh
82e82fa1a8
Implemented Hardy Veteran 2018-01-06 10:42:29 +00:00
Zzooouhh
c5f66aaafb
Implemented Goblin Trailblazer 2018-01-06 10:42:04 +00:00
Zzooouhh
658ac1dad5
Implemented Giltgrove Stalker 2018-01-06 10:41:38 +00:00
Zzooouhh
03d36dda38
Implemented Frilled Deathspitter 2018-01-06 10:41:10 +00:00
Zzooouhh
ab2a2d2567
Implemented Exultant Skymarcher 2018-01-06 10:40:41 +00:00
Zzooouhh
4ae0a9c2a7
Implemented Everdawn Champion 2018-01-06 10:40:16 +00:00
Zzooouhh
567ba78be2
Implemented Canal Monitor 2018-01-06 10:39:43 +00:00
Zzooouhh
8df88a165d
Implemented Cacophodon 2018-01-06 10:39:04 +00:00
Oleg Agafonov
c0c7a8279e [RIX] Added Kitesail Corsair 2018-01-06 09:35:23 +04:00
Oleg Agafonov
9ddda93532 Scryfall typos 2018-01-06 09:01:04 +04:00
Oleg Agafonov
9987d9493a [RIX] Added 6 cards 2018-01-06 08:55:49 +04:00
Oleg Agafonov
c569867c2d Typos 2018-01-06 06:55:35 +04:00
Oleg Agafonov
2c1c074f0a Typos 2018-01-06 05:47:33 +04:00
Oleg Agafonov
60c747f288 [RIX] Added 23 old cards, fixed file typos and renames after full spoiler by scryfall 2018-01-06 04:59:47 +04:00
Oleg Agafonov
63b2e75589 Failed, not rix, reverted :-( 2018-01-06 03:43:15 +04:00
Oleg Agafonov
8d17cde685 [RIX} Added 209 already implemented cards, fixed BafflingEnd folder 2018-01-06 03:33:22 +04:00
LevelX2
1d2483c0fd
Merge branch 'master' into Zzooouhh-rix-2 2018-01-05 23:53:02 +01:00
LevelX2
f95b0e6c0a Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-05 23:41:30 +01:00
LevelX2
7845ae6136 [RIX] Added Dire Fleet Daredevil. 2018-01-05 23:38:00 +01:00
Zzooouhh
837553ad68
Added 13 cards & minor Baffling End change 2018-01-05 22:11:15 +00:00
Zzooouhh
43c0749233
Implemented Waterknot 2018-01-05 22:09:41 +00:00
Zzooouhh
5e06e447a5
Implemented Thrashing Brontodon 2018-01-05 22:08:59 +00:00
Zzooouhh
083118b2c8
Implemented Shake The Foundations 2018-01-05 22:08:16 +00:00
Zzooouhh
1f53e59424
Implemented Luminous Bonds 2018-01-05 22:07:23 +00:00
Zzooouhh
582c186fb5
Implemented Knight of the Stampede 2018-01-05 22:06:33 +00:00
Zzooouhh
2281d23fcd
Implemented Impale 2018-01-05 22:05:56 +00:00
Zzooouhh
875ce0dee5
Implemented Flood of Recollection 2018-01-05 22:05:09 +00:00
Zzooouhh
837c610857
Implemented Famished Paladin 2018-01-05 22:04:35 +00:00
Zzooouhh
3853eeb1bc
Implemented Champion of Dusk 2018-01-05 22:03:40 +00:00
Zzooouhh
5ddbfd5bd0
Implemented Bombard 2018-01-05 22:03:01 +00:00
Zzooouhh
914f6864bb
Implemented Aztocan Seer 2018-01-05 22:02:28 +00:00
Zzooouhh
ea48f888ac
Implemented Arterial Flow 2018-01-05 22:01:35 +00:00
Zzooouhh
b99389ae19
Implemented Admiral's Order 2018-01-05 21:59:22 +00:00
LevelX2
43a5357d09 Merge origin/master 2018-01-05 15:26:56 +01:00
LevelX2
f0494383fd [RIX] Added 4 cards. 2018-01-05 15:26:10 +01:00
Oleg Agafonov
a5388456e4 Typos 2018-01-05 15:06:20 +04:00
LevelX2
174bb33464
Merge pull request #4339 from Zzooouhh/Zzooouhh-leg 
Implemented some Legends cards
 2018-01-05 10:46:55 +01:00
LevelX2
67aa13bcd5
Merge branch 'master' into Zzooouhh-rix-1 2018-01-05 10:44:06 +01:00
Zzooouhh
4b24a15bd1
Implemented cards 2018-01-05 06:08:46 +00:00
Zzooouhh
9d591b5172
Implemented cards 2018-01-05 06:08:08 +00:00
Zzooouhh
b7f3fc19f9
Implemented cards 2018-01-05 06:07:35 +00:00
Zzooouhh
8c430ea752
Implemented Shimian Night Stalker 2018-01-05 06:06:37 +00:00
Zzooouhh
2be16d467a
Implemented Halfdane 2018-01-05 06:05:29 +00:00
Zzooouhh
8681a09a0d
Implemented Gabriel Angelfire 2018-01-05 06:04:49 +00:00
Oleg Agafonov
333f9fc2e6 [RIX] Added 4 cards 2018-01-05 03:50:43 +04:00
Oleg Agafonov
24bd06a3a5 Fixed wrong ability texts with duplicated card name (see #4335) 2018-01-05 02:41:19 +04:00