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

14736 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derek M
e953bd0d7b Merge pull request #1757 from halljared/master 
[SOI] Accursed Witch Implemented
 2016-04-03 22:15:15 -04:00
Derek M
707b629130 Merge pull request #1764 from halljared/issue1755 
Fixes #1755
 2016-04-03 22:15:00 -04:00
Jared Hall
44388719a6 Fixes #1755 2016-04-03 20:35:59 -04:00
Derek M
82185f3278 Merge pull request #1760 from drmDev/master 
DeclarationInStone additional checks
 2016-04-03 06:58:31 -04:00
drmDev
56b673e1a9 DeclarationInStone additional checks 2016-04-03 06:57:47 -04:00
drmDev
db1c5ef843 Merge remote-tracking branch 'upstream/master' 2016-04-03 06:57:24 -04:00
Derek M
6710fc2630 Merge pull request #1758 from drmDev/master 
FirstSpellCastThisTurnWatcher refactored. Typo fix in Jace
 2016-04-03 06:15:14 -04:00
drmDev
316aae918b Merge remote-tracking branch 'upstream/master' 2016-04-03 06:15:03 -04:00
drmDev
44e125e604 FirstSpellCastThisTurnWatcher refactored. Typo fix in Jace 2016-04-03 06:14:29 -04:00
Jared Hall
18b92e3d76 [SOI] Accursed Witch Implemented 2016-04-03 04:29:23 -04:00
Derek M
2bc6c56118 Merge pull request #1756 from drmDev/master 
Desertion bug fix
 2016-04-03 02:23:20 -04:00
drmDev
e225bb2643 Desertion bug fix 2016-04-03 02:22:59 -04:00
Derek M
04ec66d463 Merge pull request #1754 from drmDev/master 
Avacyn test for reported bug. Creeping Dread efficiency improvements
 2016-04-02 08:18:18 -04:00
drmDev
e7b80d9548 Avacyn test for reported bug. Creeping Dread efficiency improvements 2016-04-02 08:16:47 -04:00
Derek M
b3e8f80883 Merge pull request #1751 from drmDev/master 
Creeping Dread tests and error checking
 2016-04-01 19:52:25 -04:00
drmDev
5b36756127 Creeping Dread tests and error checking 2016-04-01 19:52:11 -04:00
spjspj
99e3703d17 Merge pull request #1750 from spjspj/master 
spjspj - Add in message for F11 button
 2016-04-02 10:18:39 +11:00
spjspj
85a22ea9d9 spjspj - Add in message for F11 button 2016-04-02 10:13:54 +11:00
Derek M
13329bcd59 Merge pull request #1749 from drmDev/master 
CreepingDread implementation. Updated cards-data to fix typo.
 2016-04-01 18:36:15 -04:00
drmDev
c2b1452259 CreepingDread implementation. Updated cards-data to fix typo. 2016-04-01 18:35:05 -04:00
Styxo
2ad283c8cc Added Sylvan Echoes, edited Woodland Guidance and Entangling Trap 2016-04-01 20:52:12 +02:00
Derek M
df8d645e7c Merge pull request #1746 from drmDev/master 
Pick the Brain implementation SOI
 2016-04-01 13:29:33 -04:00
drmDev
94dccf659f Pick the Brain implementation SOI 2016-04-01 13:29:19 -04:00
spjspj
cdff987d3b Merge pull request #1744 from spjspj/master 
spjspj - Implement Eye of the Storm (RAV)
 2016-04-01 23:40:34 +11:00
spjspj
e80add345c spjspj - Implement Eye of the Storm (RAV) 2016-04-01 23:34:38 +11:00
Derek M
31a6786564 Merge pull request #1743 from drmDev/master 
FromUnderTheFloorboards card implemetnation SOI. fixed PRized Amalgam…
 2016-04-01 07:00:45 -04:00
drmDev
56b4a467de FromUnderTheFloorboards card implemetnation SOI. fixed PRized Amalgam test 2016-04-01 07:00:22 -04:00
Derek M
f6d26ea656 Merge pull request #1737 from drmDev/master 
Thing in the Ice test for reported bug
 2016-03-31 13:57:00 -04:00
drmDev
71a0d15faf Thing in the Ice test for reported bug 2016-03-31 13:56:00 -04:00
Derek M
e9efee23f4 Merge pull request #1735 from drmDev/master 
GrafMole bug fix
 2016-03-31 11:28:39 -04:00
drmDev
5f956bb69d GrafMole bug fix 2016-03-31 11:27:53 -04:00
Derek M
74322819eb Merge pull request #1726 from Styxo/master 
Implemented Soaring Hope, Militia's Pride, Ringskipper and Pulling Teeth
 2016-03-30 17:03:26 -04:00
Styxo
7ec91d55bb Merge origin/master 2016-03-30 22:23:11 +02:00
Styxo
849e7d1eee Added Soaring Hope, Militia's Pride, Ringskipper and Pulling Teeth 2016-03-30 22:17:12 +02:00
Derek M
3d8d48fcfe Merge pull request #1721 from drmDev/master 
Additional Prized amalgam test
 2016-03-30 11:56:09 -04:00
drmDev
5ac82e657f Additional Prized amalgam test 2016-03-30 11:55:42 -04:00
Derek M
61a805106b Merge pull request #1719 from drmDev/master 
Silkwrap test added for reported bug on Hangarback not getting exiled
 2016-03-30 05:23:48 -04:00
drmDev
6cfd69effb Silkwrap test added for reported bug on Hangarback not getting exiled 2016-03-30 05:21:10 -04:00
Derek M
a358140f48 Merge pull request #1717 from drmDev/master 
fix for Prized Amalgam triggering on opponent recurring creatures. Te…
 2016-03-30 04:46:51 -04:00
drmDev
8ea813e7cd fix for Prized Amalgam triggering on opponent recurring creatures. Tests added - bug remains for Gravecrawler interaction 2016-03-30 04:46:33 -04:00
Derek M
dbe11c4e0a Merge pull request #1714 from drmDev/master 
FleetingMemories clue sac bug fix
 2016-03-29 21:15:32 -04:00
drmDev
0d0bd7a859 FleetingMemories clue sac bug fix 2016-03-29 21:15:16 -04:00
Derek M
a7811b6fa7 Merge pull request #1712 from drmDev/master 
colors set for DFC night
 2016-03-29 20:45:28 -04:00
drmDev
8b1737b266 colors set for DFC night 2016-03-29 20:45:03 -04:00
Derek M
a6489c8ec3 Merge pull request #1710 from drmDev/master 
bug fixes for ConfrontTheUnknown, RelenlessDead. Card implementation …
 2016-03-29 20:19:09 -04:00
drmDev
5b96b6ccb1 bug fixes for ConfrontTheUnknown, RelenlessDead. Card implementation HarvestHand and nightside fix for it 2016-03-29 20:18:38 -04:00
Derek M
5400d312c2 Merge pull request #1709 from drmDev/master 
bug fix Ulvenwald Mysteries trigger on clue sac
 2016-03-29 14:52:54 -04:00
drmDev
90f8e03803 bug fix Ulvenwald Mysteries trigger on clue sac 2016-03-29 14:52:33 -04:00
Derek M
5320e53f5b Merge pull request #1708 from drmDev/master 
MorkrutNecropod bug fix filter
 2016-03-29 14:19:42 -04:00
drmDev
1bcb5cd4f4 MorkrutNecropod bug fix filter 2016-03-29 14:19:12 -04:00