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

18933 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingmargoudt
e6cd313843 Merge pull request #3068 from ingmargoudt/cleanups 
remove CardHelper class
 2017-04-07 10:02:45 +02:00
ingmargoudt
08197f192c remove CardHelper class 2017-04-07 10:00:16 +02:00
LevelX2
22e376699e Merge pull request #3066 from ingmargoudt/cleanups 
Cleanups
 2017-04-06 23:26:52 +02:00
LevelX2
b71c618294 [AKH] Added exert ability, Ahn-Crop Crasher and Combat Celebrant. 2017-04-06 23:10:24 +02:00
ingmargoudt
d60e01d497 move CardHelper::getColor to CardView::getColorText 2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7 remove isCreature from CardHelper, move to Cardview 2017-04-06 22:07:59 +02:00
Jeff
f43a15ab22 - Fixed Karn Liberated. 2017-04-06 11:41:51 -05:00
Jeff
8072e79571 - Fixed #3064 2017-04-06 10:57:24 -05:00
fireshoes
af0bcbc0a8 [AKH] Added some implemented cards to the Amonkhet set file. 2017-04-06 10:53:46 -05:00
fireshoes
5c97b4ce4f [AKH] Added 4/6 spoilers to mtg-cards-data.txt. 2017-04-06 10:46:12 -05:00
ingmargoudt
f22ebd3677 removed contains cardtype calls 2017-04-06 16:38:34 +02:00
ingmargoudt
ea6ba3c0a9 enum conditions 2017-04-06 16:30:22 +02:00
Derek M
4433c726f6 Merge pull request #3063 from JRHerlehy/master 
Implement Gideon of the Trials
 2017-04-06 08:00:37 -04:00
Justin Herlehy
72c7c90a9e Merge remote-tracking branch 'origin/master' 2017-04-06 00:02:01 -07:00
Justin Herlehy
932dda6d3b Implement Gideon of the Trials 
Unit Test not included as it was failing at last test.  Card tested on local server and confirmed that emblem applies as expected.
 2017-04-06 00:01:40 -07:00
Justin Herlehy
791c5b2c35 Implement Gideon of the Trials 
Unit Test not included as it was failing at last test.  Card tested on local server and confirmed that emblem applies as expected.
 2017-04-06 00:01:21 -07:00
Mark Langen
40870f22c2 Added a bunch of spoiled cards for 4/5 
* Added Colossapede
* Added Cut // Ribbons
* Added Insult // Injury (+test)
* Added Mouth // Feed
* Added Pouncing Cheetah
* Added Scarab Feast
* Added Rags // Riches (+test)
 2017-04-05 22:41:56 -06:00
LevelX2
2487cf0645 Merge pull request #3062 from ingmargoudt/cleanups 
Cleanups
 2017-04-05 22:35:05 +02:00
Jeff
efbdf9ee36 - Added Kefnet the Mindful. 2017-04-05 12:17:33 -05:00
ingmargoudt
4361b7412a can not be singleton 2017-04-05 19:10:47 +02:00
ingmargoudt
fb9d713287 singleton conditions to enum 2017-04-05 19:10:47 +02:00
ingmargoudt
809c8c97c9 introduced YouGainedLifeCondition 2017-04-05 19:10:46 +02:00
ingmargoudt
3420d0d76c use getOrDefault 2017-04-05 19:10:45 +02:00
ingmargoudt
22c842dfec refactored IntCompareCondition 2017-04-05 19:10:45 +02:00
ingmargoudt
1f89b4eedf introduced XorLessLifeCondition 2017-04-05 19:10:44 +02:00
ingmargoudt
e44b2fd673 extracted duplicate AttachmentAttachedToCardTypePredicate 2017-04-05 19:10:43 +02:00
ingmargoudt
8b90f87af6 added addCardType to MageObject 2017-04-05 19:10:43 +02:00
ingmargoudt
cf6fe27f7d duplicate continuouseffect for vehicles 2017-04-05 19:10:42 +02:00
fireshoes
2630c18e4b [AKH] Added 4/5 spoilers to mtg-cards-data.txt. 2017-04-05 10:47:25 -05:00
Jeff
b3bd801c47 - Removed unneeded import. 2017-04-05 09:01:14 -05:00
Mark Langen
383bfeb135 Merge branch 'master' of https://github.com/magefree/mage into akh-card-frame 2017-04-04 22:01:01 -06:00
Mark Langen
047449f14e * Correct type line rendering for split cards with different types on each half. 
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
 2017-04-04 21:58:52 -06:00
fireshoes
4e3d75d937 Merge origin/master 2017-04-04 21:00:03 -05:00
fireshoes
8ff947c6f0 [AKH] Added embalm to the keyword file and card gen script. Implemented the rest of the embalm cards. 2017-04-04 20:57:25 -05:00
Mark Langen
7e3d276c57 Merge pull request #3053 from magefree/akh-card-frame 
Aftermath Ability and Amonket Aftermath card frame
 2017-04-04 18:37:28 -06:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -06:00
Mark Langen
7a6b8a1540 Final Aftermath implementation stuff 
* Fixed PlayerImpl::getPlayable() to support aftermath (Needs PLAY_FROM_NOT_OWN_HAND_ZONE at the granularity of each card half rather than the whole card)
* Added tests for Dusk // Dawn to make sure there are no regressions on Aftermath.
 2017-04-04 18:28:30 -06:00
Mark Langen
fd73fd39af Addressed Feedback and added cards 
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
 2017-04-04 17:07:59 -06:00
fireshoes
2296647df9 Merge origin/master 2017-04-04 18:02:31 -05:00
fireshoes
195ff7f554 [AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards. 2017-04-04 17:57:08 -05:00
Jeff
796fca7c1b - Added Charisma. 2017-04-04 17:18:19 -05:00
LevelX2
90b43b5838 Merge pull request #3058 from ingmargoudt/client_callback_enums 
Client callback enums
 2017-04-04 23:40:57 +02:00
Jeff
da34d6c3ca - Modified set for Bronze Bombshell. 2017-04-04 15:44:42 -05:00
Jeff
b76933d5b3 - Added Bronze Bombshell. 2017-04-04 15:41:48 -05:00
ingmargoudt
c461d67d34 put disconnect reason message in enum 2017-04-04 21:59:26 +02:00
ingmargoudt
ff6d1541c3 clientcallbacks to enums 2017-04-04 21:52:15 +02:00
fireshoes
fe33f82acc [AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards. 2017-04-04 14:28:45 -05:00
ingmargoudt
0e7604a0cc Merge pull request #3057 from ingmargoudt/broadcast_fix 
broadcast fix
 2017-04-04 20:42:23 +02:00
ingmargoudt
f04fecf7a6 broadcast fix 2017-04-04 20:40:37 +02:00
LevelX2
e42d195f8d [AKH] Added Anoiter Priest and embalm ability. 2017-04-04 17:55:37 +02:00