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
16018 commits 2 branches 0 tags 782 MiB
Commit graph

16018 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
spjspj
6c92b47cd7 Merge pull request #2298 from spjspj/master 
spjspj - Generate a 'tracking issue' similar to Fenhl's for kaladesh.…
 2016-09-17 12:40:39 +10:00
spjspj
3636b84b09 spjspj - Generate a 'tracking issue' similar to Fenhl's for kaladesh. Prompt if you've not typed in a correct set name 2016-09-17 12:39:40 +10:00
Max Lebedev
7805d22de6 Merge branch 'master' of https://github.com/magefree/mage 2016-09-16 21:32:49 -04:00
Max Lebedev
43fa5ed06d Changes similar cards to have mana instead of activated abilities. This addresses the bug reported on post 201914 in the forum 2016-09-16 21:31:59 -04:00
LevelX2
ac4c6755a2 [KLD] Removed wrongly generated simple card. 2016-09-17 02:20:56 +02:00
LevelX2
f9d1c3d2cc [KLD] Added new Planeswalker types. 2016-09-17 02:15:08 +02:00
LevelX2
1673a0dcf6 [KLD] Added 6 blue cards. 2016-09-17 02:09:36 +02:00
LevelX2
b9953a5ca9 Merge origin/master 2016-09-17 02:08:47 +02:00
LevelX2
d3d1402fbb [KLD] Added 9 white cards. 2016-09-17 00:45:33 +02:00
Mark Langen
7feb237c06 Fixed card stacking offset in Editor / Library / etc. 
* Rather than respecting the spacing setting from Preferences, the spacing is now calculated from the card size if characteristic based rendering is enabled, since from the renderer we know exactly what spacing is actually needed.
 2016-09-16 16:41:00 -06:00
Mark Langen
28c04e2009 Fix cards still not showing selectable highlight in some cases 
* Simply invalidating the image render is not enough, a repaint call is also needed in a few cases where a repaint hadn't already been scheduled by the same change that trigged the selectable/chosen status change.
 2016-09-16 16:41:00 -06:00
Mark Langen
274bdfa33f Fix Issue #2277 
* Changes the white color used to a brighter white so that it shows up on the gray background.
 2016-09-16 16:40:59 -06:00
LevelX2
e669395000 Merge pull request #2296 from cg5-/some-red-cards 
Add 3 red cards
 2016-09-17 00:37:19 +02:00
cg5
286f84c861 Add 3 red cards 2016-09-17 00:27:46 +02:00
LevelX2
cf568fd41d Merge pull request #2295 from magefree/revert-2292-master 
Revert "introduced StringUtil class with .isEmpty(String input) and .…
 2016-09-17 00:10:08 +02:00
LevelX2
d7dd635bca Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…" 2016-09-16 23:55:54 +02:00
LevelX2
18e771ccd5 Fixed PayEnergyCost.pay to check counters amount available. 2016-09-16 22:29:59 +02:00