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

18626 commits

This branch
This branch
All branches
Author SHA1 Message Date
lilhomie96
de530f3025 eighth edition box set 2017-06-27 01:33:59 -05:00
lilhomie96
ff5ce7fea0 Delete EighthEditionBox.java 2017-06-26 22:42:26 -05:00
lilhomie96
0a9ac8663d Delete EighthEditionBox.java 2017-06-26 22:17:42 -05:00
lilhomie96
f8465d3671 eighth edition box set 
7 cards
 2017-06-26 22:10:29 -05:00
lilhomie96
5131aedebe eighth edition box set 2017-06-26 22:05:56 -05:00
LevelX2
9b31a5a7e3 Merge pull request #3516 from ruler501/summerproject 
Shortcut/Macro System
 2017-06-26 17:53:49 +02:00
spjspj
68baba1b0b Merge pull request #3543 from spjspj/master 
Implement The Scarab God (HOU)
 2017-06-26 23:17:13 +10:00
spjspj
dae7530155 Merge branch 'master' into master 2017-06-26 23:16:50 +10:00
spjspj
64524a8c18 Implement The Scarab God (HOU) 2017-06-26 23:13:48 +10:00
emerald000
9302940463 Removed typoed duplicate line from mtg-cards-data.txt. 2017-06-26 08:41:18 -04:00
emerald000
3388fce4c1 [HOU] Added Desert's Hold. 
Implemented OrCondition.
 2017-06-26 08:26:02 -04:00
emerald000
6ee570d5e7 [HOU] Added Angel of Condemnation. 
Implemented ExertSourceCost.
 2017-06-26 07:31:06 -04:00
spjspj
e683a579b3 Merge pull request #3512 from spacemoses/master 
Enhancement #3222 - Adding scroll to clipboard import in deck builder
 2017-06-25 23:16:21 +10:00
spjspj
081e2ad887 Merge pull request #3535 from spjspj/master 
Fix for The Scorpion God
 2017-06-25 22:58:51 +10:00
spjspj
2681091bf2 Implement The Scorpion God (HOU) 2017-06-25 22:57:39 +10:00
spjspj
9aa7829010 Implement The Scorpion God (HOU) 2017-06-25 22:38:08 +10:00
spjspj
e9a58a7fca Merge pull request #3534 from spjspj/master 
Implement The Scorpion God (HOU)  + Fix for Unesh
 2017-06-25 22:31:50 +10:00
spjspj
754b2bdfaf Implement The Scorpion God (HOU) + Fix for Unesh 2017-06-25 22:30:55 +10:00
spjspj
55a5c00e7f Merge pull request #3533 from spjspj/master 
mtg-cards-data - remove prepended 0s in collector number
 2017-06-25 21:42:12 +10:00
spjspj
cbb4c9e633 mtg-cards-data - remove prepended 0s in collector number 2017-06-25 21:41:29 +10:00
spjspj
9e35d41ab5 Merge pull request #3532 from spjspj/master 
2 x HOU cards
 2017-06-25 21:35:45 +10:00
spjspj
fc0b8ec9cb Merge branch 'master' into master 2017-06-25 21:35:37 +10:00
spjspj
67ce816381 Implement Unesh (HOU) 2017-06-25 21:33:06 +10:00
spjspj
cc368c3e1d Implement 2 cards from (HOU) 2017-06-25 21:31:12 +10:00
spjspj
8285f387db Implement Vizier of the True (HOU) 2017-06-25 20:09:50 +10:00
spjspj
e5611d1571 Merge pull request #3531 from spjspj/master 
Implement Vizier of the True (HOU)
 2017-06-25 20:07:46 +10:00
spjspj
b80aab0cfd Implement Vizier of the True (HOU) 2017-06-25 20:06:51 +10:00
LevelX2
f0dbc1da1c [HOU] Added 4 black cards. Some fixes. 2017-06-25 10:21:52 +02:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00
spjspj
2db812400e Merge pull request #3525 from spjspj/master 
HOU - Two cards
 2017-06-24 23:46:13 +10:00
spjspj
0b443b08d9 Implement Wildfire Eternal (HOU) 2017-06-24 23:45:20 +10:00
LevelX2
128b972765 [HOU] Added 5 black cards. 2017-06-24 14:00:21 +02:00
spjspj
ed22eb158c Implement Zealot of the God Trump (HOU) 2017-06-24 20:03:43 +10:00
spjspj
99260e2083 Merge pull request #3524 from spjspj/master 
HOU Reprints
 2017-06-24 19:51:52 +10:00
spjspj
724653728b HOU Reprints 2017-06-24 19:51:12 +10:00
spjspj
8371257889 Merge pull request #3523 from spjspj/master 
Implement Chandra's Defeat (HOU)
 2017-06-24 19:42:51 +10:00
spjspj
9dc866852d Implement Chandra's Defeat (HOU) 2017-06-24 19:42:09 +10:00
LevelX2
1210f9795a [HOU] Added Doomfall. 2017-06-24 11:33:53 +02:00
LevelX2
442d8ebc78 * Added HOU spoilers 2017-06-24. 2017-06-24 11:00:21 +02:00
spjspj
3c0e7bd715 Merge pull request #3522 from spjspj/master 
Implement Bontu's Last Reckoning (HOU)
 2017-06-24 18:33:12 +10:00
spjspj
7c90bbdd59 Implement Bontu's Last Reckoning (HOU) 2017-06-24 18:32:32 +10:00
spjspj
d460c017bc Merge pull request #3521 from spjspj/master 
Implement Solemnity (HOU)
 2017-06-24 17:55:34 +10:00
spjspj
f04a95c63b Implement Solemnity (HOU) 2017-06-24 17:54:41 +10:00
igoudt
5bcaafd738 implemented Afflict + simple HOU cards 2017-06-24 01:13:42 +02:00
igoudt
ae640ee0b7 refactor duplicate code for playing lands from grave 2017-06-24 00:28:34 +02:00
Ben Homer
b68091683a Added keybinding to preferences and improved UI appearance with new image file. 2017-06-22 01:42:01 -05:00
Devon Richards
63382aed93 Some stylistic fixes for code review 2017-06-21 23:51:59 -05:00
Devon Richards
f0b8fd8eec Revert "Remove failing tests for Urborg/Blood Moon" 
This reverts commit 486d05589b.
 2017-06-21 23:44:50 -05:00
Devon Richards
0d98514550 Added better UI and made it work with most categories of combos 2017-06-21 01:09:54 -05:00
Devon Richards
028d7ed1f8 Initial working product. Doesn't handle skipping stack. 2017-06-20 19:54:16 -05:00