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

17929 commits

This branch
This branch
All branches
Author SHA1 Message Date
Styxo
e2a1d4436f [AKH] Added some cards + fixes 2017-04-15 16:46:53 +02:00
Mark Langen
77586eec7e Add 30 AKH card implementations 
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
 2017-04-15 04:24:14 -06:00
Achilles
804cdf6b21 - Added Vizier of Deferment. <Amonkhet> 2017-04-14 21:34:06 -05:00
Achilles
d51eb07692 - Added Time to Reflect and Wayward Servant. <Amonkhet> 2017-04-14 18:44:25 -05:00
Mark Langen
b1ed5c3632 Fixed deck editor Drag & Drop 
* Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).
 2017-04-14 17:07:52 -06:00
fireshoes
ff27279c86 [AKH] Implemented several cards. 2017-04-14 15:06:12 -05:00
fireshoes
e4b7a65362 [AKH] Added complete spoiler to mtg-cards-data.txt. Added a few reprints. 2017-04-14 10:50:54 -05:00
spjspj
08bb21c718 Merge pull request #3109 from spjspj/master 
spjspj - Implement Gideon's Intervention (AKH)
 2017-04-14 23:44:21 +10:00
spjspj
7638c73b2f spjspj - Implement Gideon's Intervention (AKH) 2017-04-14 23:41:47 +10:00
spjspj
2fbae9b596 spjspj - Implement Gideon's Intervention (AKH) 2017-04-14 23:40:39 +10:00
fireshoes
7dea71df59 [AKH] Implemented some of the 4/13 spoiled cards. 2017-04-13 23:28:21 -05:00
fireshoes
15ea3626ae [AKH] Added more 4/13 spoilers to mtg-cards-data.txt. 2017-04-13 20:22:19 -05:00
spjspj
b620859d34 Merge pull request #3108 from spjspj/master 
spjspj - Implement Cradle of the Accursed (AKH)
 2017-04-14 10:02:52 +10:00
spjspj
97a74df8ea spjspj - Implement Cradle of the Accursed (AKH) 2017-04-14 09:46:21 +10:00
spjspj
52afe9de36 Merge pull request #3107 from spjspj/master 
spjspj - Implement 2x cards (AKH)
 2017-04-14 09:01:42 +10:00
spjspj
82a1583dfa spjspj - Implement 2x cards (AKH) 2017-04-14 08:59:33 +10:00
Jeff
1c958ccc72 - A watcher for Shadows of the Grave. 2017-04-13 17:03:23 -05:00
Jeff
f62ad6db96 - Added Shadow of the Grave. <Amonkhet> 2017-04-13 17:01:07 -05:00
fireshoes
0c9ad1e8b2 [AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas. 2017-04-13 10:10:59 -05:00
Jeff
53d41783a3 - Added Samut, Voice of Dissent. <Amonkhet> 2017-04-13 09:59:38 -05:00
Jeff
6b65572de0 - Fixed Bontu the Glorified. 2017-04-13 08:42:59 -05:00
Styxo
97a00695cf [AKH] Added rest of 4/12 spoilers and implemented some cards 2017-04-13 15:02:50 +02:00
ingmargoudt
24bf3c8f77 Merge pull request #3104 from ingmargoudt/compile_error_fix 
fix for endreksahr
 2017-04-13 08:41:06 +02:00
ingmargoudt
58b7148de9 fix for endreksahr 2017-04-13 07:50:44 +02:00
spjspj
0920c6dcad Merge pull request #3103 from spjspj/master 
spjspj - Implement Failure // Comply (AKH)
 2017-04-13 12:53:06 +10:00
spjspj
8cf1c2aad8 spjspj - Implement Failure // Comply (AKH) 2017-04-13 12:52:13 +10:00
spjspj
a429bc044b Merge pull request #3102 from spjspj/master 
spjspj - Implement Harsh Mentor (AKH)
 2017-04-13 10:34:02 +10:00
spjspj
4f21af64c5 spjspj - Implement Harsh Mentor (AKH) 2017-04-13 10:32:44 +10:00
spjspj
954cd88f95 spjspj - Implement Harsh Mentor (AKH) 2017-04-13 10:30:17 +10:00
Jeff
b1b4ef1086 - Added Bontu the Glorified. <Amonkhet> 2017-04-12 16:45:41 -05:00
Jeff Wadsworth
3e4665dbe7 Merge pull request #3101 from ingmargoudt/compile_error_fix 
Merge request
 2017-04-12 16:21:02 -05:00
ingmargoudt
8871be844f fix compile errors 2017-04-12 22:35:32 +02:00
Derek M
8816bf83a2 Merge pull request #3100 from Darkside-/master 
Add Cards for AHK
 2017-04-12 15:02:05 -04:00
Darkside
cd47ef1869 Add Enigma Drake to AKH 2017-04-12 13:39:15 -05:00
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
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