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

18323 commits

This branch
This branch
All branches
Author SHA1 Message Date
spjspj
9c487b7310 Merge pull request #3116 from spjspj/master 
Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString'
 2017-04-16 22:04:44 +10:00
spjspj
c895253d5b Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString' 2017-04-16 22:04:07 +10:00
LevelX2
d1d9683d84 Merge origin/master 2017-04-16 13:29:31 +02:00
LevelX2
664405caab [AKH] Added Vizier of Many Faces. 2017-04-16 13:28:36 +02:00
spjspj
f5613f02c5 Merge pull request #3115 from spjspj/master 
Fix Pyramid of the Pantheon, added class for 'new cards' found in fin…
 2017-04-16 21:21:11 +10:00
spjspj
f43eb06953 Fix Pyramid of the Pantheon, added class for 'new cards' found in find_new_cards.pl 2017-04-16 21:19:40 +10:00
LevelX2
20a1c02f4d Merge origin/master 2017-04-16 13:04:54 +02:00
LevelX2
c033868795 [AKH] Added Vizier of Many Faces. 2017-04-16 13:04:38 +02:00
spjspj
5ed434ce8c Merge pull request #3114 from spjspj/master 
Minor fix
 2017-04-16 20:07:20 +10:00
spjspj
7937bcda9e Revert 2017-04-16 20:06:27 +10:00
spjspj
4abb1072cc Minor fix 2017-04-16 18:14:14 +10:00
spjspj
7f1d978660 Merge pull request #3113 from spjspj/master 
spjspj - Implement Pyramid of the Pantheon (AKH)
 2017-04-16 18:08:35 +10:00
spjspj
5bc43d0520 Merge branch 'master' of https://github.com/spjspj/mage 2017-04-16 18:07:59 +10:00
spjspj
fc1d1a996d spjspj - Implement Pyramid of the Pantheon (AKH) 2017-04-16 18:07:40 +10:00
spjspj
2a36bc4506 Merge pull request #3112 from spjspj/master 
Pyramid of the Pantheon
 2017-04-16 17:29:51 +10:00
spjspj
be106091ed Pyramid of the Pantheon 2017-04-16 17:29:11 +10:00
spjspj
b59ed5e3b7 Pyramid of the Pantheon 2017-04-16 17:28:09 +10:00
fireshoes
06fdd17e7d [AKH] Updated tooltip text on several white and blue cards. Some minor fixes. 2017-04-15 23:37:50 -05:00
LevelX2
88d25b7a3a [AKH] Added New Perspectives. 2017-04-16 01:38:59 +02:00
LevelX2
4044b9aa3b [AKH] Embalm - Fixed that the token wrongly had the mana costs of the original card. 2017-04-16 01:38:36 +02:00
LevelX2
f58ab300b2 [AKH] Added Gate to the Afterlife. 2017-04-16 00:16:52 +02:00
drmDev
7de31a8e68 Merge remote-tracking branch 'upstream/master' 2017-04-15 13:14:31 -04:00
spjspj
41c199b8d3 Merge pull request #3111 from spjspj/master 
spjspj - Implement Decimator Beetle (AKH)
 2017-04-16 02:59:20 +10:00
spjspj
09a2db88b1 spjspj - Implement Decimator Beetle (AKH) 2017-04-16 02:58:37 +10:00
Styxo
77976cb0c8 Merge origin/master 2017-04-15 18:55:22 +02:00
Styxo
5a2678f916 [AKH] Code deduplication and fixes 2017-04-15 18:53:57 +02:00
LevelX2
8fd0b89ebd Merge origin/master 2017-04-15 18:52:20 +02:00
LevelX2
bebb2a4de7 Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?). 2017-04-15 18:51:54 +02:00
Achilles
75d0a8a238 - Added Luxa River Shrine. <Amonkhet> 2017-04-15 11:46:15 -05:00
LevelX2
88d121f6e9 Fixed a problem that Ai players did no longer work in tournaments. 2017-04-15 18:15:07 +02:00
LevelX2
f90d49ae0a Fixed a problem that general tournament messages (not send by a user) were no longer displayed. 2017-04-15 18:14:39 +02:00
LevelX2
d08de1812e [AKH] Added Open into Wonder. 2017-04-15 18:13:36 +02:00
Achilles
b666b7ab5d - added target to Grasping Dunes ability. 2017-04-15 10:15:00 -05:00
Achilles
94912e1cfd - Added Edifice of Authority and Grasping Dunes. <Amonkhet> 2017-04-15 10:12:55 -05:00
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