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

18742 commits

This branch
This branch
All branches
Author SHA1 Message Date
spjspj
31e0e97a3a Merge pull request #3567 from Archer262/master 
Added 4 Hour of Devastation Cards
 2017-07-03 23:51:10 +10:00
spjspj
b34d2318fe Merge branch 'master' into master 2017-07-03 23:50:54 +10:00
spjspj
610be4ed2c Merge pull request #3565 from nickymikail/master 
Oketra's Avenger
 2017-07-03 23:44:42 +10:00
spjspj
82c0594302 Merge pull request #3577 from spjspj/master 
Implement 1 card (HOU)
 2017-07-03 23:44:07 +10:00
spjspj
1e1321be14 Implement 1 card (HOU) 2017-07-03 23:43:23 +10:00
spjspj
533440693e Merge pull request #3576 from spjspj/master 
Implement 1 card (HOU)
 2017-07-03 20:59:39 +10:00
spjspj
422afec3fe Implement 1 card (HOU) 2017-07-03 20:58:42 +10:00
spjspj
01ae2c0e6b Implement 1 card (HOU) 2017-07-03 20:38:42 +10:00
spjspj
568db84e4d Merge pull request #3575 from spjspj/master 
Implement 1 card (HOU)
 2017-07-03 20:26:53 +10:00
spjspj
6ba9edb799 Merge branch 'master' into master 2017-07-03 20:26:46 +10:00
spjspj
c1f7a10867 Implement 1 card (HOU) 2017-07-03 20:25:04 +10:00
spjspj
519c92a34b Merge pull request #3574 from spjspj/master 
Implement 5 cards (HOU)
 2017-07-03 19:44:00 +10:00
spjspj
7418c01bed Implement 5 cards (HOU) 2017-07-03 19:42:53 +10:00
LevelX2
a86f930117 Merge origin/master 2017-07-03 08:59:25 +02:00
LevelX2
a3ea1a8f49 [HOU] Added 2 cards. 2017-07-03 08:58:48 +02:00
spjspj
65bc4ff5a4 Merge pull request #3573 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-03 09:09:02 +10:00
spjspj
8e4f478946 Implement 2 cards (HOU) 2017-07-03 09:08:24 +10:00
nickymikail
3debc25a56 suggested fixes 2017-07-02 10:04:34 -07:00
spjspj
d8dfda2c25 Merge pull request #3572 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-03 00:23:54 +10:00
spjspj
c3c09eab2c Implement 2 cards (HOU) 2017-07-03 00:23:05 +10:00
Archer262
a8235e414a Dutiful Servants 2017-07-02 10:04:21 -04:00
Archer262
e64a7ad5f7 Djeru's Renunciation 2017-07-02 10:02:17 -04:00
Archer262
fe921f4d00 Disposal Mummy 2017-07-02 09:57:02 -04:00
Archer262
aa1f401a25 Dauntless Aven 2017-07-02 09:45:50 -04:00
igoudt
7d8ff852f6 Merge https://github.com/magefree/mage 2017-07-02 15:39:36 +02:00
igoudt
7028f8ee3d implement Chaos Maw 2017-07-02 15:36:18 +02:00
Archer262
126a95bd1c Aven of Enduring Hope 2017-07-02 08:58:37 -04:00
spjspj
75cb28374b Merge pull request #3571 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-02 22:48:58 +10:00
spjspj
e0464635c4 Implement 2 cards (HOU) 2017-07-02 22:48:00 +10:00
Archer262
310ac060e2 Format Fix 2017-07-02 08:32:17 -04:00
igoudt
e302e5f302 added dutiful servants, rampagin hippo, scrounger of souls 2017-07-02 13:54:10 +02:00
igoudt
b573d72883 added UT, fix small bug on Hour of Revelation 2017-07-02 13:08:03 +02:00
spjspj
1f59818515 Merge pull request #3570 from spjspj/master 
Implement Tragic Lesson (HOU)
 2017-07-02 17:14:55 +10:00
spjspj
dac9f4f4a8 Implement Tragic Lesson (HOU) 2017-07-02 17:11:48 +10:00
Archer262
891cf38a3b Act Of Heroism 2017-07-02 00:19:17 -04:00
spjspj
11c0d0e1c3 Merge pull request #3569 from spjspj/master 
Implement 2 HOU cards
 2017-07-02 13:50:15 +10:00
spjspj
a1dcaa6a89 Implement 2 HOU cards 2017-07-02 13:49:33 +10:00
Archer262
3cd5309317 Merge pull request #1 from magefree/master 
Merge Update
 2017-07-01 22:47:14 -04:00
spjspj
e9b617a1a8 Merge pull request #3568 from spjspj/master 
2 HOU cards
 2017-07-02 12:47:06 +10:00
spjspj
4a29f7a0f0 Implement Vizier of the Anointed (HOU) 2017-07-02 12:46:06 +10:00
spjspj
2b4bf16cec Implement 2 HOU cards 2017-07-02 12:15:05 +10:00
Archer262
c6291316cd Added Beneath the Sands [HOU] 2017-07-01 22:14:50 -04:00
Archer262
0230185721 Revert "Fork Test" 
This reverts commit 554c2b2084.
 2017-07-01 22:05:13 -04:00
Archer262
301ea285d5 Revert "Remove Git Test" 
This reverts commit bc69e08c1a.
 2017-07-01 22:04:17 -04:00
spjspj
5311c5a2d4 Merge pull request #3566 from spjspj/master 
HOU - 3 split cards already implemented
 2017-07-02 11:20:57 +10:00
spjspj
d66663191c HOU - 3 split cards already implemented 2017-07-02 11:18:55 +10:00
Archer262
bc69e08c1a Remove Git Test 2017-07-01 21:10:12 -04:00
Archer262
554c2b2084 Fork Test 2017-07-01 21:06:45 -04:00
nickymikail
186fdb0cac Ruin Rat 2017-07-01 16:15:58 -07:00
nickymikail
f80bcfdfa2 Lurching Rotbeast 2017-07-01 15:02:15 -07:00