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

16185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dilnu
6ef1018f6f Merge remote-tracking branch 'origin/master' 2016-09-18 11:55:02 -04:00
spjspj
44d9836be9 Merge pull request #2322 from spjspj/master 
KLD fixes - paradoxical outcome + bad forest
 2016-09-19 00:51:07 +10:00
Dilnu
6ddbf5b560 Revert "Remove files about to be renamed to allow for merge." 
This reverts commit a2f3089913.
 2016-09-18 10:50:41 -04:00
spjspj
e9d2d48459 Wrong collector ID 2016-09-19 00:49:21 +10:00
spjspj
a5e6bf6896 Some minor fixes. 2016-09-19 00:45:18 +10:00
Get
ed7378da66 Player Panel UI redesign (new icons, new colors, new buttons) 2016-09-18 17:10:54 +03:00
cg5
33e1e03288 Fix Aetherborn Marauder's ability 2016-09-18 16:07:21 +02:00
Dilnu
a2f3089913 Remove files about to be renamed to allow for merge. 2016-09-18 09:47:58 -04:00
spjspj
877c4ffa61 Merge pull request #2316 from cg5-/bug-fixes 
Fix bugs in Ninth Bridge Patrol and Renegade Freighter
 2016-09-18 23:23:24 +10:00
cg5
bf16b25f51 Fix bugs in Ninth Bridge Patrol and Renegade Freighter 2016-09-18 12:25:03 +02:00
spjspj
88b557e1b2 Merge pull request #2317 from spjspj/master 
Some minor fixes for grabbag
 2016-09-18 20:22:00 +10:00
spjspj
8cf4acb68a Some minor fixes. 2016-09-18 20:20:04 +10:00
LevelX2
e5466470ef * Select for Inspection - Fixed wrong casting costs (fixes #2315). 2016-09-18 09:07:20 +02:00
LevelX2
c971aea67d * Gonti, Lord of Luxury - Fixed a endless loop error. 2016-09-18 01:15:56 +02:00
LevelX2
844b36c7dc * Glimmer of Genius - Fixed the missing Instant card type. 2016-09-18 00:16:20 +02:00
LevelX2
f9789ee078 xmage 1.4.15v2 2016-09-17 20:43:39 +02:00
LevelX2
a1e70e21f4 [KLD] Some more fixes. 2016-09-17 20:18:54 +02:00
LevelX2
bf73eb4042 Merge pull request #2310 from fenhl/ae 
Change AE to Ae
 2016-09-17 19:04:42 +02:00
LevelX2
a6d72d4101 [KLD] Some more fixes. 2016-09-17 19:01:00 +02:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
346b6654f8 [KLD] Some minor fixes. 2016-09-17 18:17:01 +02:00
LevelX2
d9c804602e Merge origin/master 2016-09-17 17:01:29 +02:00
LevelX2
1d4d612501 [KLD] Some card names fixed. 2016-09-17 17:01:06 +02:00
spjspj
086ef80172 Merge pull request #2309 from spjspj/master 
spjspj - Fairgrounds Trumpeter (KLD)
 2016-09-18 00:46:22 +10:00
LevelX2
04ca15a3a9 Some minor fixes. 2016-09-17 16:45:53 +02:00
spjspj
7ccd05afd5 spjspj - Fairgrounds Trumpeter (KLD) 2016-09-18 00:45:35 +10:00
LevelX2
5d98324c82 Merge origin/master 2016-09-17 16:32:42 +02:00
LevelX2
9accd877a5 [KLD] Added 7 green and 1 multicolor card. 2016-09-17 16:32:17 +02:00
spjspj
9151199d7c Merge pull request #2308 from spjspj/master 
spjspj - Durable Handicraft(KLD)
 2016-09-18 00:07:12 +10:00
spjspj
73a6749dbc spjspj - Durable Handicraft(KLD) 2016-09-18 00:06:07 +10:00
LevelX2
4b768812f6 [KLD] Added 6 artifacts and 1 multicolor card. 2016-09-17 15:56:18 +02:00
spjspj
68be138d6b Merge pull request #2307 from spjspj/master 
spjspj - Deadlock Trap (KLD)
 2016-09-17 23:30:22 +10:00
spjspj
f891d66e92 spjspj - Deadlock Trap (KLD) 2016-09-17 23:29:24 +10:00
LevelX2
e7c5effa7f [KLD] Added 13 red cards. 2016-09-17 15:18:34 +02:00
LevelX2
c087296c05 Merge origin/master 2016-09-17 14:57:24 +02:00
spjspj
5b2052701f Merge pull request #2305 from spjspj/master 
spjspj - 1 kld card
 2016-09-17 22:40:09 +10:00
spjspj
a6723dade7 spjspj - 1 kld card 2016-09-17 22:39:31 +10:00
spjspj
39fa152daa Merge pull request #2304 from spjspj/master 
spjspj - 3 KLD cards
 2016-09-17 22:32:30 +10:00
spjspj
b697e6bcfa spjspj - 3 KLD cards 2016-09-17 22:31:25 +10:00
LevelX2
c515a6d690 [KLD] Added 15 black cards. 2016-09-17 13:44:30 +02:00
spjspj
c8937f8ab4 Merge pull request #2302 from spjspj/master 
spjspj - 4 Green / Golgari card/s
 2016-09-17 18:59:29 +10:00
spjspj
c412544280 spjspj - 2 KLD {G} cards 2016-09-17 18:57:44 +10:00
spjspj
cc01ae7634 spjspj - Kujar Seedsculptor 2016-09-17 18:49:15 +10:00
spjspj
9417f6f186 spjspj - Hazardous Conditions 2016-09-17 18:29:41 +10:00
LevelX2
5244363081 [KLD] Added 7 blue cards. 2016-09-17 10:17:40 +02:00
LevelX2
18cce84694 [KLD] Added 4 cards implemented from ingmargoudt. 2016-09-17 08:41:39 +02:00
LevelX2
12001a6a03 Merge pull request #2297 from maxlebedev/master 
Changes similar cards to have mana instead of activated abilities.
 2016-09-17 08:30:56 +02:00
Max Lebedev
a5fb372d3c Selvala Explorer Returned now has a mana ability (I hope) 2016-09-17 01:40:01 -04:00
spjspj
160aafcec9 Merge pull request #2299 from spjspj/master 
spjspj - Empyreal Voyager
 2016-09-17 13:32:59 +10:00
spjspj
a82584461a spjspj - Empyreal Voyager 2016-09-17 13:30:38 +10:00