github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-18 03:00:11 +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
igoudt
352637d411 Merge https://github.com/magefree/mage into text 2017-06-06 09:32:52 +02:00
igoudt
0cb7d8aab6 loop to streams 2017-06-06 09:31:41 +02:00
fireshoes
52b4633340 Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01. 2017-06-05 16:00:13 -05:00
LevelX2
0fd72c3010 * Added check if the deck was modified during sideboarding. 2017-06-05 20:23:09 +02:00
LevelX2
3c6ede7407 * Improved game is infinite loop check to ask players only if some kind of iteration is recognized. 2017-06-05 12:27:59 +02:00
LevelX2
2728a274ca Merge pull request #3466 from use/samut-the-tested 
Implement Samut, the Tested
 2017-06-05 11:17:26 +02:00
LevelX2
92b1cd27be Merge branch 'master' into samut-the-tested 2017-06-05 11:17:06 +02:00
LevelX2
63f952a5ae Merge pull request #3469 from use/nicol-bolas-god-pharoh 
Add Nicol Bolas, God-Pharoh
 2017-06-05 11:16:21 +02:00
LevelX2
003408046e Merge branch 'master' into nicol-bolas-god-pharoh 2017-06-05 11:16:03 +02:00
fireshoes
e762812a0b Added upcoming FNM promos. Added HOU spoilers to mtg-cards-data.txt. Added Masterpiece info to HOU set. 2017-06-04 22:31:01 -05:00
Will Hall
d989a0e013 Add Nicol Bolas, God-Pharoh 2017-06-04 19:26:26 -07:00
Derek M
2fa6b499a3 Merge pull request #3468 from drmDev/master 
added nest of scarabs test for wither. unable to replicate #3402
 2017-06-04 21:45:14 -04:00
Derek Monturo
2b25b53541 added nest of scarabs test for wither. unable to replicate #3402 2017-06-04 21:44:19 -04:00
Will Hall
1850e650de Add loyalty cost to note for Samut's ultimate 2017-06-04 15:29:33 -07:00
Will Hall
ce521e2a1f Implement Samut, the Tested 2017-06-04 10:26:52 -07:00
igoudt
d42b2a6d37 change text for cycling to this card, rather than referring the name 2017-06-04 17:12:08 +02:00
spjspj
14a68ae010 Merge pull request #3465 from spjspj/master 
Implement O-Kagachi, Vengeful Kami (C17)
 2017-06-04 20:29:06 +10:00
spjspj
a371802cc0 Implement O-Kagachi, Vengeful Kami (C17) 2017-06-04 20:27:48 +10:00
spjspj
91bc48e2ae Merge pull request #3463 from spjspj/master 
Implement Ramos, Dragon Engine (C17)
 2017-06-04 00:15:18 +10:00
spjspj
aec720055a Implement Ramos, Dragon Engine (C17) 2017-06-04 00:13:52 +10:00
spjspj
1ea8d3a4c6 Implement Ramos, Dragon Engine (C17) 2017-06-04 00:12:00 +10:00
spjspj
cf36661770 Implement Ramos, Dragon Engine (C17) 2017-06-04 00:09:06 +10:00
spjspj
9be172cd2f Merge pull request #3462 from spjspj/master 
Add spoilers for Commander 2017 (some collector numbers missing)
 2017-06-03 18:57:26 +10:00
spjspj
dce86c2255 Add spoilers for Commander 2017 (some collector numbers missing) 2017-06-03 18:52:39 +10:00
LevelX2
b62a15f68e Merge pull request #3454 from drmDev/add/welcomedeck2017 
adding welcome deck 2017 (see #3453)
 2017-06-03 10:31:49 +02:00
LevelX2
13ea2c33c6 Merge pull request #3447 from aastrand/master 
Ban ignored users from watching
 2017-06-03 10:31:24 +02:00
ingmargoudt
f9984528b8 Merge pull request #3460 from ingmargoudt/issue_3443 
test manatype on enum, not on string
 2017-06-02 17:28:10 +02:00
igoudt
35ae9e316e test manatype on enum, not on string 2017-06-02 17:27:36 +02:00
ingmargoudt
745c3a9a7e Merge pull request #3457 from magefree/issue_3443 
Issue 3443
 2017-05-31 22:34:25 +02:00
igoudt
86bc25811d completed UT for 3443 2017-05-31 22:33:02 +02:00
igoudt
b0a6c76228 fixes 3443 2017-05-31 00:29:06 +02:00
ingmargoudt
6733a5f338 Merge pull request #3455 from ingmargoudt/text 
minor text fixes
 2017-05-30 23:46:56 +02:00
igoudt
9ac70b868d minor text fixes 2017-05-30 23:46:06 +02:00
Anders Åstrand
4d0e8cb443 Review fixes 2017-05-30 18:55:40 +02:00
Derek Monturo
1d662a0a58 adding welcome deck 2017 - closes #3453 2017-05-30 07:31:14 -04:00
Derek M
c0041245d5 Merge pull request #3450 from drmDev/bug/eternalthirst 
eternal thirst non-optional. fixes #3449
 2017-05-29 16:22:18 -04:00
Derek Monturo
61f1c2e0c8 eternal thirst non-optional. fixes #3449 2017-05-29 16:21:39 -04:00
Anders Åstrand
ad0507e739 Ban ignored users from watching 
This commit bans ignored users from watching
games where the creator has them on their ignore list.
 2017-05-29 21:36:42 +02:00
Simown
62c14a9c24 Added missed private member 2017-05-29 13:40:48 +01:00
Simown
12a520c85a Fixed mock split card generation. Fixes #3444. 
Implementation was missing - copied it from actual split cards.
 2017-05-29 13:33:50 +01:00
LevelX2
485ea2729a Merge origin/master 2017-05-28 23:47:28 +02:00
LevelX2
884a3af503 * Norn's Annex - Fixed a bug with the payment of phyrexian mana (fixes #3178). 2017-05-28 23:45:41 +02:00
ingmargoudt
eb21b0051a Merge pull request #3446 from ingmargoudt/text 
Text
 2017-05-28 22:57:10 +02:00
igoudt
63b69cb5db missed some mtg subtypes 2017-05-28 22:56:27 +02:00
igoudt
d99a444389 exert can't --> won't 2017-05-28 22:56:27 +02:00
LevelX2
09e4435a89 * Fixed a problem that watcher added from cards are not reset between games of a match (fixes #3228). 2017-05-28 18:24:37 +02:00
LevelX2
c0f02259ec * Planar Chaos - Fixed that the flip of the second ability was always done from the Planar Chaos controller instead of the spell caster. 2017-05-28 17:26:57 +02:00
ingmargoudt
1af39d5659 Merge pull request #3441 from ingmargoudt/text 
text fix for exert, removed comparator
 2017-05-28 12:49:20 +02:00
igoudt
83c3dc05b2 forloop to stream 2017-05-28 12:24:06 +02:00
igoudt
2fc742d77d minor typo 2017-05-28 12:23:49 +02:00