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

15462 commits

This branch
This branch
All branches
Author SHA1 Message Date
Samuel Sandeen
bf613572e9 Fix another merge artifact. 2016-07-10 19:07:53 -04:00
Samuel Sandeen
c7cdd792d0 Remove Merge conflict artifacts. 2016-07-10 19:05:41 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
Samuel Sandeen
8fe5bf4fbb Update the uses of PreventAllDamageByAllPermanentsEffect to use the new name. 2016-07-10 18:55:58 -04:00
Samuel Sandeen
3f0ff01bbc Add files via upload 2016-07-10 18:47:32 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
LevelX2
cb91282f9e [EMN] Some fixes to Dark Salvation, Eldrich Moon, Make Mischief. 2016-07-10 22:02:56 +02:00
LevelX2
01c21723fd Merge pull request #2060 from magefree/revert-2029-audio_threadpool 
Revert "Use a dedicated thread pool for audio"
 2016-07-10 22:01:26 +02:00
LevelX2
8e76430d07 Revert "Use a dedicated thread pool for audio" 2016-07-10 22:01:06 +02:00
LevelX2
09273f284d [EMN] Set Hanwar the Writhing Township to nightSide 2016-07-10 21:07:59 +02:00
LevelX2
772abd9311 Merge origin/master 2016-07-10 20:58:51 +02:00
LevelX2
1e120bdeaa [EMN] Added Dark Salvation and a workaroung version of Slayer's Cleaver. The meld cards without meld. 2016-07-10 20:58:26 +02:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
de0b66240f [EMN] Added 3 black cards. 2016-07-10 11:11:56 +02:00
LevelX2
0017f7a458 [EMN] Added 8 black cards. 2016-07-10 10:43:26 +02:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
fd55feee17 [EMN] Added the missing multicolor cards. 2016-07-10 10:09:06 +02:00
drmDev
55aae9910e fixes #2054 2016-07-10 03:27:33 -04:00
drmDev
e317719e16 [EMN] some black cards implemented 2016-07-09 19:15:04 -04:00
drmDev
4423f1e7fc the real [EMN] commit... 2016-07-09 16:48:33 -04:00
drmDev
2e4384ef68 [EMN] implemented many more colorless cards 2016-07-09 16:46:56 -04:00
drmDev
566e667780 Merge remote-tracking branch 'upstream/master' 2016-07-09 16:32:06 -04:00
drmDev
f694c2106b additional card fix for #2057 2016-07-09 16:31:17 -04:00
drmDev
6fe2c226b8 fixes #2057 2016-07-09 16:29:43 -04:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
drmDev
29b3a2398d Merge remote-tracking branch 'upstream/master' 2016-07-09 09:45:36 -04:00
drmDev
d234fb7961 Added some colorless cards (EMN) 2016-07-09 09:45:03 -04:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
fireshoes
e01a594ef8 [EMN] Added a missing card spoiler to mtg-cards-data.txt. 2016-07-08 12:06:12 -05:00
fireshoes
4cf3f29c4c [EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints. 2016-07-08 11:18:14 -05:00
Derek M
451a0aa594 Merge pull request #2055 from drmDev/master 
Reflector Mage restriction effect fix
 2016-07-08 08:53:38 -04:00
drmDev
18e8a6dc49 Merge branch 'master' of https://github.com/drmDev/mage 2016-07-08 08:51:21 -04:00
LevelX2
4522eda79c Fixed a bug of PutTokenOntoBattlefieldCopyTargetEffect causing Myriad tests to fail. 2016-07-08 12:14:38 +02:00
fireshoes
d30736de38 [EMN] Added Mind's Dilation, Splendid Reclamation, and Bedlam Reveler. Fixed some card translations. 2016-07-07 22:26:25 -05:00
drmDev
16ce177143 Reflector Mage restriction effect fix 2016-07-07 20:27:49 -04:00
fireshoes
742acf5406 [EMN] Added 7/7 spoilers to mtg-cards-data.txt. Implemented several cards. 2016-07-07 18:42:43 -05:00
fireshoes
7172606506 [EMN] Added additional 7/6 spoilers to mtg-cards-data.txt. Implemented Wolfkin Bond and Noose Constrictor. 2016-07-06 23:39:12 -05:00
jeff
6441a3dac3 - Little fix for Bruna, Light of Alabaster. 2016-07-06 15:44:24 -05:00
fireshoes
b8d7ee2c02 [EMN] Added 7/6 spoilers to mtg-cards-data.txt. Implemented Permeating Mass and Falkenrath Reaver. Add Meld reminder text to Bruna, Midnight Scavengers, and Hanweir Garrison. Fixed translated name of Collective Defiance. 2016-07-06 10:56:38 -05:00
LevelX2
21e1b98637 * Fixed wrong card number of Wild Pair PLC. 2016-07-06 17:18:52 +02:00
LevelX2
d95c13c563 * Fixed a problem of Identity Thief (fixes ##2052). 2016-07-06 16:14:51 +02:00
LevelX2
c236f1f8e1 Merge pull request #2048 from shootbot/master 
Implemented 'The Rack' from 'Duels of the Planeswalkers'
 2016-07-06 11:32:38 +02:00
fireshoes
edc6ef36ac [EMN] Added additional 7/5 spoilers to mtg-cards-data.txt. Fixed some translated text. 2016-07-05 18:07:41 -05:00
fireshoes
f0d169367a [EMN] Added 7/5 spoilers to mtg-cards-data.txt. Implemented some new cards. Fixed Liliana and Ishkanah to only filter controlled creatures. 2016-07-05 10:48:25 -05:00
spjspj
1082008b24 Merge pull request #2051 from spjspj/master 
spjspj - Implement Identity Thief [EMN]
 2016-07-05 22:55:42 +10:00
spjspj
fabbcbddc1 spjspj - Implement Identity Thief [EMN] 2016-07-05 22:52:23 +10:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00