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

15746 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
d6366be9ea [KLD] Added 3 green adn 3 red cards. 2016-09-16 17:27:21 +02:00
spjspj
5e6df1d1df Merge pull request #2288 from spjspj/master 
spjspj - Combustible Gearhulk
 2016-09-16 23:48:25 +10:00
spjspj
24ae338f87 spjspj - Combustible Gearhulk 2016-09-16 23:47:44 +10:00
spjspj
a82c8d9903 Merge pull request #2287 from spjspj/master 
spjspj - Combustible Gearhulk
 2016-09-16 23:46:47 +10:00
spjspj
25674c00da spjspj - Combustible Gearhulk 2016-09-16 23:43:27 +10:00
LevelX2
a0e797cc5c [KLD] Added 5 red cards. 2016-09-16 15:08:03 +02:00
spjspj
a7ef570457 Merge pull request #2286 from spjspj/master 
spjspj - ChandrasPyrohelix
 2016-09-16 21:57:51 +10:00
spjspj
0a43d2abd4 spjspj - ChandrasPyrohelix 2016-09-16 21:57:17 +10:00
spjspj
e4d390bb2b Merge pull request #2285 from spjspj/master 
spjspj - Fix for BallistaCharger
 2016-09-16 21:54:44 +10:00
spjspj
a8c3ebe7ed spjspj - Fix for BallistaCharger 2016-09-16 21:54:07 +10:00
spjspj
d46736a59f Merge pull request #2284 from spjspj/master 
spjspj - Add two vehicles
 2016-09-16 21:47:14 +10:00
spjspj
1a29534f6a spjspj - Add two vehicles 2016-09-16 21:46:10 +10:00
LevelX2
779dd35559 Merge pull request #2282 from Dilnu/master 
Add token support to ZonesHandler
 2016-09-16 11:10:07 +02:00
ingmargoudt
23675b57d6 Merge pull request #2283 from ingmargoudt/master 
added some missing session references
 2016-09-16 09:47:24 +02:00
ingmargoudt
71398d6d83 added some missing session references 2016-09-16 08:58:44 +02:00
fireshoes
1b5d697b33 Merge origin/master 2016-09-16 01:29:38 -05:00
fireshoes
f35da6030c [KLD] Updated mtg-cards-data with more 9/15 spoilers. Implemented several blue cards. 2016-09-16 01:27:11 -05:00
Mark Langen
7e2f606d8a Fix issue #2249 - Black borders on non-rendered cards 
* Turns out that drawing black borders on non-rendered cards, while it fixes what was probably a bug, has unintentional and undesirable implications. Needs further work in the future, but revert it for now.
 2016-09-15 20:06:37 -06:00
fireshoes
31afdefe7b [KLD] Updated mtg-cards-data with another 9/15 spoiler. Implemented several cards. Minor text fixes. 2016-09-15 19:36:19 -05:00
Samuel Sandeen
17d4d6c190 Handle tokens correctly in the new zone change code. 2016-09-15 19:44:32 -04:00
Samuel Sandeen
377a0edec9 Fix a bug in the cheat system for manual testing. 2016-09-15 19:20:04 -04:00
Mark Langen
24beaa08f9 Vehicle P/T Rendering Enhancement 
* Non-animated vehicle permanents have their P/T dimmed to distinugish their status past the type line changes.
 2016-09-15 17:18:20 -06:00
LevelX2
3fb5a60202 [KLD] Added 12 green cards. 2016-09-16 00:41:03 +02:00
LevelX2
ce004cc2b7 * Added some missing static SessionHandler usages. 2016-09-16 00:40:37 +02:00
Mark Langen
80e8603a3a Fixed mana-symbol-textbox being rendered on permanents other than lands 
* Basic lands have the mana symbol in their textbox rather than their actual text. That was erroneously being applied to other permanents like Elvish Mystics with only a single mana adding ability as text.
 2016-09-15 16:07:24 -06:00
Mark Langen
5a6a62ecbf Fix wrong order on ability rendering 
* Keyword abilities were being rendered *last* on cards instead of first as they should be.
 2016-09-15 16:07:24 -06:00
LevelX2
47e38e32bb [KLD] Added 2 white cards. Name fix for Master Trinketeer. 2016-09-15 22:31:26 +02:00
LevelX2
f6ef3db9b9 * Added some missing static SessionHandler usages. 2016-09-15 22:30:41 +02:00
LevelX2
4990bf7de5 Merge pull request #2281 from ingmargoudt/master 
removed the Session out of local scope and introduced a static Sessio…
 2016-09-15 21:50:58 +02:00
ingmargoudt
3019991473 removed the Session out of local scope and introduced a static SessionHandler that acts as interface to remote.Session 2016-09-15 20:52:41 +02:00
fireshoes
360823ec2e [KLD] Updated mtg-cards-data with 9/15 spoilers. Implemented several cards. 2016-09-15 12:02:13 -05:00
spjspj
d41c2cee34 Merge pull request #2280 from spjspj/master 
spjspj - Add 'grab-bag' of images that seem harder to get.
 2016-09-16 01:43:21 +10:00
spjspj
a0c09ecf6a spjspj - Add 'grab-bag' of images that seem harder to get. 2016-09-16 01:41:10 +10:00
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