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
19998 commits 2 branches 0 tags 782 MiB
Commit graph

12035 commits

Author SHA1 Message Date
theelk801
9ebe516681 Merge branch 'master' into master 2017-09-08 18:48:51 -04:00
Evan Kranzler
b10ae22bc3 resolve conflicts 2017-09-08 18:48:08 -04:00
Evan Kranzler
dc8c9b8dbe Implemented Fell Flagship 2017-09-08 18:43:23 -04:00
Justin Herlehy
f77907c442 [XLN] Add Growing Rites of Itlimoc//Itlimoc, Cradle of the Sun 2017-09-08 15:36:13 -07:00
Evan Kranzler
aa4b5f38c5 fixed conflicts 2017-09-08 18:30:42 -04:00
Evan Kranzler
4be1e6b743 Implemented Growing Rites of Itlimoc and Itlimoc, Cradle of the Sun, also small changes 2017-09-08 18:12:10 -04:00
LevelX2
f73abc2c3f [XLN] Added 5 cards. 2017-09-08 23:50:32 +02:00
Evan Kranzler
da6e1a5f0d Implemented Thundering Spineback 2017-09-08 17:43:14 -04:00
Evan Kranzler
93cab598fd Implemented Lurking Chupacabra 2017-09-08 17:10:23 -04:00
Evan Kranzler
3e39158d83 Implemented Vraska, Relic Seeker 2017-09-08 17:02:50 -04:00
Evan Kranzler
b463c5331d Implemented Vona, Butcher of Magan 2017-09-08 16:42:11 -04:00
Evan Kranzler
9918b8894e Implemented Lookout's Dispersal 2017-09-08 16:35:28 -04:00
Evan Kranzler
83d2ae388e Implemented Merfolk Branchwalker 2017-09-08 16:26:37 -04:00
Evan Kranzler
e6bf3c51bf Implemented Otepec Huntmaster and Commune with Dinosaurs 2017-09-08 16:23:03 -04:00
Evan Kranzler
5109e6e620 Implemented Grazing Whiptail 2017-09-08 16:10:10 -04:00
Evan Kranzler
63df22d1b1 fixed Dovescape not using LKI for countered spells 2017-09-08 15:45:52 -04:00
Evan Kranzler
3cc178196e Refactored more subtypes usages to enum 2017-09-08 11:05:58 -04:00
Evan Kranzler
92b999a9b4 Refactored more subtypes usages to enum 2017-09-08 10:26:03 -04:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
Evan Kranzler
80b61ccbd6 Refactored more subtypes usages to enum 2017-09-08 09:31:06 -04:00
igoudt
d79c57b907 Merge https://github.com/magefree/mage 2017-09-08 13:12:03 +02:00
igoudt
2355d35e04 small fixes 2017-09-08 13:11:58 +02:00
Evan Kranzler
c33fe6a7e5 Refactored more subtypes usages to enum 2017-09-07 21:48:59 -04:00
Evan Kranzler
245bf2f2df Refactored subtypes to enum 2017-09-07 21:18:19 -04:00
Evan Kranzler
e27d302e9d updated card generation template for subtype enum 2017-09-07 15:58:55 -04:00
Evan Kranzler
935eefcf01 Implemented Arguel's Blood Fast/Temple of Aclazotz 2017-09-07 15:04:19 -04:00
Evan Kranzler
abc71defd0 Implemented Duskborne Skymarcher 2017-09-07 14:34:54 -04:00
Evan Kranzler
207ffe7c57 Implemented Ravenous Daggertooth 2017-09-07 14:26:21 -04:00
Evan Kranzler
e9f9eb1cea Implemented Raptor Hatchling 2017-09-07 14:25:15 -04:00
Evan Kranzler
1d74000903 Implemented Ranging Raptors 2017-09-07 14:23:31 -04:00
Evan Kranzler
0656f97d7c Merge branch 'master' of https://github.com/magefree/mage into magefree-master 
# Conflicts:
#	Utils/mtg-cards-data.txt
 2017-09-07 11:36:07 -04:00
Evan Kranzler
8e464f89a7 Implemented Boneyard Parley 2017-09-07 11:23:11 -04:00
Evan Kranzler
da7ff83478 Implemented Ashes of the Abhorrent 2017-09-07 10:21:10 -04:00
Evan Kranzler
c2e25fc51f Implemented Hostage Taker 2017-09-07 10:01:13 -04:00
Evan Kranzler
4f0991ae97 Implemented Kopala, Warden of Waves 2017-09-07 09:40:13 -04:00
Evan Kranzler
ffa519dc08 Implemented Frenetic Raptor 2017-09-06 22:39:58 -04:00
Evan Kranzler
c5fc7f715c added Dinosaur errata 2017-09-06 22:29:59 -04:00
Evan Kranzler
c765f0d8e9 Implemented Wakening Sun's Avatar 2017-09-06 22:13:34 -04:00
Evan Kranzler
8b6aa6d463 Implemented Sorcerous Spyglass 2017-09-06 20:59:41 -04:00
Evan Kranzler
ce2c1bb61d Implemented Kinjalli's Sunwing 2017-09-06 18:09:54 -04:00
Evan Kranzler
e954de0012 Implemented Fathom Fleet Captain 2017-09-06 18:04:41 -04:00
Evan Kranzler
0f72c4fb22 Additional token effect text changes 2017-09-06 17:39:58 -04:00
Evan Kranzler
6fc78d1d78 Implemented Pirate's Cutlass, changed text templating for creating token effects 2017-09-06 16:21:06 -04:00
Evan Kranzler
1021ba2d61 Implemented Ixalan's Binding 2017-09-06 15:44:21 -04:00
Evan Kranzler
363a06065d Implemented Savage Stomp 2017-09-06 12:55:20 -04:00
Evan Kranzler
a50150c70f Implemented Storm Fleet Arsonist 2017-09-06 12:23:49 -04:00
Evan Kranzler
08b18ac4c1 Implemented Wily Goblin 2017-09-06 11:51:42 -04:00
Evan Kranzler
ae53c5aad2 Implemented Wildgrowth Walker 2017-09-06 11:49:26 -04:00
Evan Kranzler
62feb30510 Implemented Storm Fleet Aerialist 2017-09-06 11:26:07 -04:00
Evan Kranzler
6e6f1f0bfc Implemented Regisaur Alpha 2017-09-06 11:20:33 -04:00
Evan Kranzler
35622e855d added XLN reprints 2017-09-06 11:08:15 -04:00
theelk801
4d73ee6587 Merge pull request #3942 from theelk801/master 
small fix, updated XLN spoiler
 2017-09-06 10:59:47 -04:00
Evan Kranzler
b793367d4d Fixed Kalastria Highborn 2017-09-06 10:23:37 -04:00
nachazo
d0aa1d3cd9 Update Exodus.java 2017-09-06 11:15:03 +02:00
nachazo
b7224fe42a Add files via upload 2017-09-06 11:10:45 +02:00
nachazo
c37ac86705 Update Exodus.java 2017-09-06 11:09:49 +02:00
Evan Kranzler
30a569d271 Implemented Sanctum Seeker 2017-09-05 21:53:55 -04:00
Evan Kranzler
6f70a09a98 Implemented Huatli's Spurring 2017-09-05 21:42:52 -04:00
Evan Kranzler
99d3a74310 Implemented Thaumatic Compass and Spires of Orazca 2017-09-05 20:17:02 -04:00
Evan Kranzler
fce99fa182 Implemented Conqueror's Galleon/Foothold 2017-09-05 19:39:04 -04:00
Evan Kranzler
601e7cba9b Implemented Wanted Scoundrels 2017-09-05 18:59:49 -04:00
Evan Kranzler
f235bdc36e Implemented Settle the Wreckage 2017-09-05 15:26:45 -04:00
Evan Kranzler
ab2c171854 Implemented Shapers of Nature 2017-09-05 14:57:57 -04:00
Evan Kranzler
96a85fe787 Implemented Sun-Blessed Mount 2017-09-05 14:50:52 -04:00
Evan Kranzler
3a31ce225e Implemented Grasping Current 2017-09-05 14:47:57 -04:00
Evan Kranzler
062a0c3ec3 Implemented Raging Swordtooth 2017-09-05 14:33:35 -04:00
Evan Kranzler
16c6b5d23f Implemented Kitesail Freebooter 2017-09-05 14:28:48 -04:00
Evan Kranzler
d8e2052531 Implemented Overflowing Insight 2017-09-05 14:01:18 -04:00
Evan Kranzler
737878f43b Implemented Castaway's Despair 2017-09-05 13:59:12 -04:00
Evan Kranzler
94b62c5c04 Implemented Deadeye Quartermaster 2017-09-05 13:48:08 -04:00
theelk801
1f92fbcf3e Merge pull request #56 from magefree/master 
merge
 2017-09-05 13:31:28 -04:00
Evan Kranzler
1937ea4f89 Implemented Drover of the Mighty 2017-09-05 13:27:51 -04:00
Evan Kranzler
9a2972f82f Implemented Huatli's Snubhorn 2017-09-05 13:27:49 -04:00
Evan Kranzler
ede69d2ce9 Implemented Jace's Sentinel 2017-09-05 13:27:47 -04:00
Christian
1fe26f1409 Implemented Goring Ceratops 2017-09-05 11:33:43 -04:00
LevelX2
3af9bd894f * Vision Charm - Fixed bug that caused exception. 2017-09-05 16:31:44 +02:00
LevelX2
eba1539fce Merge origin/master 2017-09-05 16:21:23 +02:00
LevelX2
0ce13bf676 * Grenzo, Havoc Raiser - Fixed that blocked the game. 2017-09-05 16:20:58 +02:00
theelk801
e21d97b032 Merge pull request #3936 from theelk801/master 
Added XLN spoilers
 2017-09-05 09:59:17 -04:00
Evan Kranzler
63dc293835 Added XLN spoilers 2017-09-05 09:53:17 -04:00
LevelX2
cd9827300d Some minor changes. 2017-09-05 12:00:42 +02:00
LevelX2
5bef2a4eeb * Powder Keg - Fixed that the destroy ability did not work. 2017-09-05 12:00:13 +02:00
LevelX2
b459e590ad * Atarka, World Render - Removed accidently added kicker ability (fixes #3935). 2017-09-05 11:19:35 +02:00
Evan Kranzler
db9922c169 Implemented Primal Amulet and Primal Wellspring 2017-09-04 21:46:38 -04:00
Evan Kranzler
9e44a1f152 Implemented Huatli, Warrior Poet 2017-09-04 21:02:33 -04:00
theelk801
1c0d75952c Merge pull request #3933 from theelk801/master 
Implemented XLN cards
 2017-09-04 18:32:14 -04:00
Evan Kranzler
fa9516533f Implemented Tilonallis Skinshifter 2017-09-04 18:28:52 -04:00
Evan Kranzler
d14658e27e Implemented Deadeye Plunderers 2017-09-04 17:58:03 -04:00
Evan Kranzler
010a02a272 Implemented Dire Fleet Captain 2017-09-04 17:48:33 -04:00
Evan Kranzler
b5e803d25d Implemented Pillar of Origins 2017-09-04 17:43:26 -04:00
Evan Kranzler
462daa89b4 Implemented Sentinel Totem 2017-09-04 17:38:51 -04:00
theelk801
10b7f53d9c Merge pull request #3926 from caldover/master 
Implemented Deathless Ancient
 2017-09-04 17:31:33 -04:00
Evan Kranzler
d0a4e5a420 Implemented Mavren Fein and Call to the Feast 2017-09-04 17:29:45 -04:00
Christian Aldover
1cd91b3dd0 Update DeathlessAncient.java 
Updated notTarget from false to true
 2017-09-04 17:14:51 -04:00
Evan Kranzler
16ae822a5f fixed XLN card names 2017-09-04 15:53:27 -04:00
theelk801
86c4ade983 Merge branch 'master' into master 2017-09-04 11:37:24 -04:00
Evan Kranzler
669190486d Implemented Admiral Beckett Brass 2017-09-04 11:35:37 -04:00
TacomenX
3fa142cc0b Deeproot Waters + Merfolk Hexproof Token 2017-09-04 09:45:20 -05:00
TacomenX
518bae18df [XLN] Deeproot Waters + Merfolk Hexproof Token 2017-09-04 01:29:20 -05:00
TacomenX
10c3c6fdb9 [IXL] Bishop Of Rebirth Implementation 2017-09-04 00:46:56 -05:00
theelk801
b3a8aba62f Merge pull request #52 from magefree/master 
merge
 2017-09-03 09:08:20 -04:00
LevelX2
a510180ac8 C17 Added New Blood (text change not working, but the rest) 2017-09-03 07:32:27 +02:00
LevelX2
66c69e51a3 Started to implement a solution for effects that change words in rule text. 2017-09-03 07:31:36 +02:00
Evan Kranzler
faa4dd2fe3 . 2017-09-02 22:19:32 -04:00
Evan Kranzler
7a18726a40 . 2017-09-02 22:18:56 -04:00
Evan Kranzler
53db9dadbb Implemented Twilight Legion Battleship 2017-09-02 22:03:16 -04:00
Christian
83e4d30601 Merge branch 'master' of https://github.com/magefree/mage 2017-09-02 20:36:29 -04:00
Christian
cd91c9516d Implemented Deathless Ancient 2017-09-02 20:36:12 -04:00
Evan Kranzler
aa78e8bfa8 Implemented Militant Dinosaur 2017-09-02 17:07:00 -04:00
Evan Kranzler
48f4b575bd Implemented Bellowing Aegisaur 2017-09-02 13:17:25 -04:00
Evan Kranzler
6a3c6fc534 fixed bug #3922 2017-09-02 12:52:39 -04:00
Evan Kranzler
575c27eb90 fixed bug #3921 2017-09-02 12:20:05 -04:00
Evan Kranzler
5b87f665d2 Implemented Marauding Looter 2017-09-02 10:47:04 -04:00
Evan Kranzler
a8abdba0ad Implemented Huatli, Dinosaur Mage 2017-09-02 10:19:20 -04:00
Evan Kranzler
ec9af6b475 Implemented Jace, Ingenious Mind-Mage 2017-09-02 09:49:07 -04:00
Evan Kranzler
95a2544a33 Implemented Kumena's Omenspeaker 2017-09-02 09:11:20 -04:00
igoudt
e2ad4a6654 Merge https://github.com/magefree/mage 2017-09-02 13:03:46 +02:00
LevelX2
3812b5cbed C17 Added Stalking Leonin. 2017-09-02 11:04:24 +02:00
theelk801
bda6658d79 Merge pull request #50 from magefree/master 
merge
 2017-09-01 21:25:20 -04:00
Evan Kranzler
1f382a7ce7 Implemented Jace, Cunning Castaway (ultimate won't work correctly until planeswalker rule is removed) 
various other small changes as well
 2017-09-01 21:20:05 -04:00
Evan Kranzler
9e11b533c2 updated Amonkhet full-art basics (#3452) 2017-09-01 19:03:10 -04:00
LevelX2
f80129a0ed Fixed some missing sourceIds. 2017-09-02 00:44:58 +02:00
LevelX2
5bf1741656 Fixed some missing sourceIds. 2017-09-02 00:44:52 +02:00
Evan Kranzler
9d6fdbb600 Implemented River's Rebuke, fixed Hurkyl's Recall 2017-09-01 18:20:11 -04:00
Evan Kranzler
7c64e487ab Implemented Daring Saboteur 2017-09-01 18:11:36 -04:00
Evan Kranzler
1ad8325377 Implemented Angrath's Marauders 2017-09-01 17:59:58 -04:00
igoudt
43bb541876 Merge https://github.com/magefree/mage 2017-09-01 22:49:50 +02:00
igoudt
f0623d37c9 some cleanups 2017-09-01 22:48:42 +02:00
Evan Kranzler
d28de9e357 Implemented Shifty Doppelganger 2017-09-01 16:38:40 -04:00
Evan Kranzler
3d2b9093b2 Implemented Burning Sun's Avatar 2017-09-01 10:16:53 -04:00
Evan Kranzler
30c77a9d07 Implemented Entrancing Melody 2017-09-01 10:05:22 -04:00
Evan Kranzler
029420a9a8 fixed enrage text 2017-09-01 09:57:11 -04:00
Evan Kranzler
f6dd9cadae Implemented Gishath, Sun's Avatar 2017-09-01 09:54:50 -04:00
Evan Kranzler
28112ccbc8 Implemented Old-Growth Dryads 2017-09-01 09:19:21 -04:00
spjspj
50af966d3e Merge pull request #3914 from spjspj/master 
Fix for Molten Psyche - Was doing two lots of damage
 2017-09-01 22:42:44 +10:00
spjspj
69d87e7359 Fix for Molten Psyche - Was doing two lots of damage 2017-09-01 22:42:03 +10:00
LevelX2
77f6f7b2b6 * Tawnos's Coffin - Fixed that it did not work correctly if abilities were copied by Mairsil, The Pretenderand and general rework. 2017-09-01 12:36:40 +02:00
spjspj
34e9fb7296 Merge pull request #3913 from spjspj/master 
Implement 1 card (XLN)
 2017-09-01 20:22:58 +10:00
spjspj
6fae2ce41f Implement 1 card (XLN) 2017-09-01 20:21:23 +10:00
LevelX2
b54402ebb2 * Temporal Distortion - Fixed casting cost. 2017-09-01 10:55:46 +02:00
LevelX2
ad94d7ca41 * Mist of Stagnation - Fixed casting cost. 2017-09-01 10:53:05 +02:00
igoudt
63695f9b5b fix thorncaster sliver controlled effect 2017-09-01 01:01:08 +02:00
spjspj
29649a4b81 Merge pull request #3910 from spjspj/master 
Slight fix
 2017-08-31 23:55:44 +10:00
spjspj
ade4c65902 Slight fix 2017-08-31 23:54:56 +10:00
spjspj
e14f9a2f8d Merge pull request #3909 from spjspj/master 
Implement Tocatli Honor Guard (XLN)
 2017-08-31 23:52:12 +10:00
spjspj
05ef6211c0 Implement Tocatli Honor Guard (XLN) 2017-08-31 23:51:36 +10:00
theelk801
bdf45b9d13 Merge pull request #3908 from theelk801/master 
Implemented 4 XLN cards
 2017-08-31 09:33:32 -04:00
spjspj
f58f9c6dd8 Merge branch 'master' into master 2017-08-31 23:20:44 +10:00
spjspj
930cf8ab17 Implement 2 cards (XLN) 2017-08-31 23:19:04 +10:00
Evan Kranzler
cf29ae8fd9 Implemented Rowdy Crew 2017-08-31 09:16:21 -04:00