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

18354 commits

This branch
This branch
All branches
Author SHA1 Message Date
Darkside
f53d4c4f75 Merge remote-tracking branch 'upstream/master' 2017-04-12 13:32:18 -05:00
Darkside
c2ba110375 Add Sweltering Suns to AHK 2017-04-12 13:27:02 -05:00
Derek Monturo
e32e279432 Merge remote-tracking branch 'upstream/master' 2017-04-12 14:16:49 -04:00
fireshoes
30bbbf528e Merge origin/master 2017-04-12 12:52:47 -05:00
fireshoes
581beb4bfe [AKH] Implemented several cards. Added 4/12 spoilers to mtg-cards-data.txt. 2017-04-12 12:42:22 -05:00
Derek M
1a6c6d9ba9 Merge pull request #3099 from Darkside-/master 
Add Lord of the Accursed for AKH
 2017-04-12 13:13:26 -04:00
Darkside
bccb09366e Add Lord of the Accursed for AKH 2017-04-12 10:58:34 -05:00
Jeff
6cec543809 - Added Bounty of the Luxa. <Amonkhet> 2017-04-12 10:06:24 -05:00
Derek M
3e6a925271 Merge pull request #3088 from ingmargoudt/fixes 
Fixes
 2017-04-12 10:08:27 -04:00
spjspj
316693c064 Merge pull request #3097 from spjspj/master 
Minor housekeeping
 2017-04-12 21:55:47 +10:00
LevelX2
b5886cca99 Merge pull request #3081 from ThomasLerner/master 
Ice Cave Implementation
 2017-04-12 09:50:40 +02:00
spjspj
2a39a8e5cf minor housekeeping 2017-04-12 16:07:18 +10:00
spjspj
171c3997e6 minor housekeeping 2017-04-12 16:05:54 +10:00
spjspj
f0fb3692af Merge pull request #3096 from spjspj/master 
spjspj - Implement Harsh Mentor (AKH)
 2017-04-12 14:16:56 +10:00
spjspj
ea98f96a92 spjspj - Implement Harsh Mentor (AKH) 2017-04-12 14:16:04 +10:00
spjspj
c4c5f86943 Merge pull request #3095 from spjspj/master 
Amonkhet - Minor housekeeping
 2017-04-12 12:26:11 +10:00
spjspj
239d931774 Amonkhet - minor housekeeping 2017-04-12 12:24:21 +10:00
spjspj
d82eeacf4f Amonkhet - minor housekeeping 2017-04-12 12:17:30 +10:00
spjspj
dc108faf8b Merge pull request #3094 from spjspj/master 
Rhonas - fix in mtg-cards-data.txt
 2017-04-12 12:14:37 +10:00
spjspj
c5d9daccbe Rhonas - fix in mtg-cards-data.txt 2017-04-12 12:12:43 +10:00
spjspj
b2fa07462a Merge pull request #3092 from spjspj/master 
spjspj - Fix up gen-existing-cards-by-set.pl for handling split cards…
 2017-04-12 10:45:57 +10:00
spjspj
83971539d2 spjspj - Fix up gen-existing-cards-by-set.pl for handling split cards (relevant to Amonkhet). 2017-04-12 10:10:33 +10:00
Mark Langen
db74576397 Added 4 cards from AHK 
* Added Cartouche of Strength
* Added Nest of Scarabs (More correct implementation than existing one)
* Added Soul-Scar Mage
* Added Battlefield Scavenger
 2017-04-11 17:40:15 -06:00
Jeff
04f1b6306a - Added Cruel Reality. <Amonkhet> 2017-04-11 17:53:34 -05:00
fireshoes
923e9818eb Merge origin/master 2017-04-11 16:15:02 -05:00
fireshoes
20772ff370 Added Legacy Cube April 2017.[AKH] Added 4/11 spoilers to mtg-cards-data.txt. 2017-04-11 16:14:31 -05:00
Jeff
fb923865a8 - Added Watchers of the Dead. <Amonkhet> 2017-04-11 16:14:03 -05:00
Derek M
d7db5b6288 Merge pull request #3090 from Darkside-/master 
added deem worthy and grim strider to AKH
 2017-04-11 16:39:53 -04:00
Timothy Rice
b101492af9 added grim strider to AKH 2017-04-11 15:35:39 -05:00
Timothy Rice
49a37ad804 added deem worthy to AKH 2017-04-11 15:23:04 -05:00
Derek M
a5b32bc181 Merge pull request #3089 from Darkside-/master 
fixed Mistform creature types and verify test for phyrexian mana
 2017-04-11 15:42:23 -04:00
Timothy Rice
89ee5eeeae fixed Mistform creature types and verify test for phyrexian mana 2017-04-11 13:58:01 -05:00
ingmargoudt
03643d53a3 rename counttype to comparisontype 2017-04-11 17:01:59 +02:00
ingmargoudt
60a325c43f fix reversed intcompare 2017-04-11 16:50:46 +02:00
Styxo
46d44f84e3 [AKH] Added Hapatra, Nest of Scarabs and Throne of the God Pharao and removed redundant code 2017-04-11 15:20:55 +02:00
drmDev
f22c91f82b Merge remote-tracking branch 'upstream/master' 2017-04-11 07:47:58 -04:00
Styxo
058b9e970c [AKH] Name fix 2017-04-11 11:57:29 +02:00
Styxo
0d40fccc62 [AKH] Added rest of 4/10 spoilers 2017-04-11 11:07:39 +02:00
ingmargoudt
cb693b5826 there were 3 enums to compare ints, refactored to 1 2017-04-11 09:15:12 +02:00
ingmargoudt
813d84274a removed string constructor in SuperTypePredicate 2017-04-11 09:15:09 +02:00
ingmargoudt
8b44327312 wrong negation 2017-04-11 09:15:09 +02:00
ingmargoudt
5dfc0392f9 Merge pull request #3086 from ingmargoudt/play_match_human_fix 
fixed two lines to allow playing human-human tables
 2017-04-11 08:06:15 +02:00
ingmargoudt
fea477dd04 fixed two lines to allow playing human-human tables 2017-04-11 07:54:54 +02:00
Achilles
a08155341e - Added Vizier of the Menagerie. <Amonkhet> 2017-04-11 00:34:18 -05:00
drmDev
6e66e7703f Merge remote-tracking branch 'upstream/master' 2017-04-10 21:27:50 -04:00
fireshoes
7da69e5064 Merge origin/master 2017-04-10 18:46:43 -05:00
fireshoes
5fbcf759d6 [ANK] Added 4/10 spoilers to mtg-cards-data.txt and implemented a many cards. 2017-04-10 18:45:48 -05:00
Mark Langen
2b08d5a101 As Foretold Implemented 
* Final change to card casting code to support as foretold. Removed all of the "Can't cast cards with no mana cost" code from the earlier parts of the casting process and simplified it to just the PlayerImpl::canPlay check and one final check in the main AbilityImpl::activate code after alternative costs have been chosen.
 2017-04-10 17:00:27 -06:00
Mark Langen
c22a8f717e Fix for problem introduced in 321f5597b7 
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
 2017-04-10 16:13:42 -06:00
Mark Langen
b33e03862a Work in progress changes to support As Foretold 
* Modifies how cards with no mana cost are handled. You can now begin to cast them if there is an AlternativeCost that would allow you to play them.
 2017-04-10 16:13:42 -06:00