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

15913 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
0a5a073637 * Flashback - Fixed handling of combined flashback costs (e.g. Deep Analysis). 2016-09-15 17:34:25 +02:00
LevelX2
0042dc1ad9 Some minor fixes to game log / card rules text /messages. 2016-09-15 16:10:17 +02:00
ingmargoudt
4e3ec26dbd Merge pull request #2264 from maxlebedev/master 
Added Dream Leash
Code checked, thanks
 2016-09-15 13:27:59 +02:00
Mark Langen
45c02de82d Merge branch 'master' of https://github.com/magefree/mage 2016-09-15 00:57:48 -06:00
Mark Langen
9927123cb3 Made deck area orientation dynamic. 
* Deck area orientation now changes depending on the context.
* In free building and sideboarding, the sideboard and maindeck are shown side by side.
* In limited deckbuilding, the sideboard (with your limited pool) is shown above the maindeck.
 2016-09-15 00:55:23 -06:00
fireshoes
4c0c7b512b [KLD] Updated mtg-cards-data with more 9/14 spoilers. Add 6 white cards. 2016-09-15 01:43:53 -05:00
emerald000
b3acb61be5 [KLD] Added 4 cards. 
Metalwork Colossus, Perpetual Timepiece, Restoration Gearsmith and Torch Gauntlet.
 2016-09-15 01:35:27 -04:00
Mark Langen
577bdaea84 Fixes and additions to card rendering 
* Vehicles are rendered with a vehicle background and changed P/T box color
* Kaladesh Inventions are rendered with the invention frame
* Kaladesh Inventions use the full-frame art if they detect that you have that full art downloaded instead of normal card images.
* Changed land text-box colors to be a bit more saturated to make it clearer what colors they produce
* Added mana symbol in the textbox of basic lands instead of rules text as long as they have no additional abilities.
* Fixed problem with triggered abilities on the stack showing up with a type of "??? Ability". Not sure what the real cause is but those abilities have abilityType = null, just worked around it.
 2016-09-14 19:37:12 -06:00
Samuel Sandeen
0c8ff64027 Merge pull request #2273 from Dilnu/master 
Fix an edge case in the zones code
 2016-09-14 19:34:35 -04:00
Samuel Sandeen
91b4e024fb Remove a bit of duplicate code. 2016-09-14 19:33:17 -04:00
Samuel Sandeen
edd97587fc Add code for a few edge cases in zone change handling 
Specifically this should fix the bugs that happen when tokens copy
PermanentCards.
 2016-09-14 19:30:14 -04:00
Samuel Sandeen
0214576146 Merge branch 'magefree/master' 2016-09-14 18:56:20 -04:00
LevelX2
9f199dfa39 * ZonesHandler - fixed possible null pointer exception (#2271). Cause still unclear. 2016-09-14 23:25:36 +02:00
LevelX2
e73be58113 * Crown of Doom - Fixed a bug of target handling of the activated ability. 2016-09-14 22:49:13 +02:00
LevelX2
14cd2dfa6d * Jeleva, Nephalia's Scourge and Knowledge Pool - Fixed a bug that created null pointer exception if card was cast from exile. 2016-09-14 22:31:04 +02:00
LevelX2
547d53a2ec [KLD] Added 5 white cards. 2016-09-14 21:51:52 +02:00
fireshoes
9bd9fa2e53 [KLD] Updated mtg-cards-data with 9/14 spoilers. Implemented some black cards and reprints. 2016-09-14 14:29:16 -05:00
LevelX2
14b2760e99 * Fixed a bug that prevented moving tokens to other zones in some cases. 2016-09-14 20:51:03 +02:00
LevelX2
445a8a242e * Reverted the library quick fix for random because RandomUtil works now. 2016-09-14 19:02:27 +02:00
LevelX2
eae53c0cfc Merge pull request #2268 from ingmargoudt/master 
replace [list].size() == 0 and [string].length() == 0 to use .isEmpty…
 2016-09-14 17:15:10 +02:00
LevelX2
ce94e573e4 * Ral Zarek - Fixed target handling of ability one. 2016-09-14 17:11:18 +02:00
LevelX2
317ba7fd87 * Terastodon - Fixed a problem that tokens were already created before all target permanents were destroyed. 2016-09-14 16:08:31 +02:00
ingmargoudt
3128bd2b4b replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead 2016-09-14 15:27:31 +02:00
LevelX2
3612332607 [KLD] Added Speedway Fanatic. Added tests for crew keyword. 2016-09-14 15:16:40 +02:00
LevelX2
975e530d55 * Added artifact subtype "Vehicle". 2016-09-14 13:13:57 +02:00
LevelX2
9de78b5c5f * Added artifact subtype "Vehicle". 2016-09-14 12:38:26 +02:00
LevelX2
8598cf2a33 Merge pull request #2262 from ingmargoudt/master 
removed some contains on sets
 2016-09-14 12:19:28 +02:00
emerald000
542a1ef1d9 [KLD] Added 5 cards. 
Bomat Courier, Dovin Baan, Electrostatic Pummeler, Scrapheap Scrounger and Whirler Virtuoso.
 2016-09-14 03:27:48 -04:00
ingmargoudt
5023149578 Merge remote-tracking branch 'origin/master' 2016-09-14 09:11:49 +02:00
ingmargoudt
e62241c3eb fix for the RandomUtil, always use .current() to get the correct thread. 2016-09-14 09:11:26 +02:00
ingmargoudt
5289dd3df8 no need to do contains followed by an add on a set #2 2016-09-14 09:10:08 +02:00
ingmargoudt
aad6a0d1f3 no need to do contains followed by an add on a set 2016-09-14 09:10:08 +02:00
Samuel Sandeen
716c07f057 Merge pull request #2267 from Dilnu/master 
Fix an undocumented bug with Mindless Null
 2016-09-13 21:16:38 -04:00
Samuel Sandeen
c6e2dc100c Don't not an equals outside the equals. 2016-09-13 21:15:29 -04:00
Samuel Sandeen
e64e068b88 Remove unneeded code in SkyblinderStaff 2016-09-13 21:09:26 -04:00
Samuel Sandeen
612e53300b Fix Mindless Null 2016-09-13 21:08:08 -04:00
Samuel Sandeen
441f350acb Merge pull request #2266 from Dilnu/master 
Fix Skybinder Staff
 2016-09-13 20:52:45 -04:00
Samuel Sandeen
9f111984da Merge branch 'magefree/master' 2016-09-13 20:51:35 -04:00
Samuel Sandeen
7c3c8403b2 Fix Skybinder Staff 2016-09-13 20:51:09 -04:00
fireshoes
69984a3d27 Added Legacy Cube September 2016. [KLD] Updated mtg-cards-data.txt with more 9/13 spoilers. 2016-09-13 14:19:57 -05:00
Max Lebedev
14629dbd71 Added Dream Leash 2016-09-13 14:33:20 -04:00
spjspj
183ee9f2d8 Merge pull request #2263 from spjspj/master 
spjspj - Add alternative SCG tokens from alternative.mtg.onl
 2016-09-14 02:14:15 +10:00
spjspj
4a15228bf2 spjspj - Add alternative SCG tokens from alternative.mtg.onl 2016-09-14 02:13:01 +10:00
ingmargoudt
cae5fc1755 no need to do contains followed by an add on a set #2 2016-09-13 17:27:44 +02:00
ingmargoudt
baec87739c no need to do contains followed by an add on a set 2016-09-13 17:25:58 +02:00
fireshoes
52ca2563af [KLD] Updated mtg-cards-data.txt with 9/13 spoilers. 2016-09-13 10:14:32 -05:00
spjspj
eff547e28f Merge pull request #2261 from spjspj/master 
spjspj - Fix for mtg.onl
 2016-09-14 00:43:11 +10:00
spjspj
08df195bc3 spjspj - Fix for mtg.onl 2016-09-14 00:38:24 +10:00
emerald000
959eaf6dab [KLD] Added Panharmonicon. 2016-09-13 08:21:16 -04:00
LevelX2
5e7a4d265e Merge pull request #2254 from royk/add-deck-support 
Add support for .dek files
 2016-09-13 11:56:46 +02:00