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

15903 commits

This branch
This branch
All branches
Author SHA1 Message Date
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot. 
Better display of energy counters would be preferred.
 2016-09-07 01:07:21 -04:00
Mark Langen
b549dfe0dc Added frameStyle Characteristic for cards 
* Added FrameStyle Enum containing a list of styles that cards can be rendered in.

* Added getFrameStyle() getter to Card interface.

* Implemented getFrameStyle() for various concrete implementations of Card.
 2016-09-06 21:50:04 -06:00
fireshoes
f67cb21f2a [KLD] Implemented Chandra, Torch of Defiance; Chandra, Pyrogenius; Nissa, Nature's Artisan; and Nissa, Vital Force. 2016-09-06 22:15:33 -05:00
Mark Langen
0ea9d33211 Fixed card highlighting 
* Changed CardPanelRenderImpl to correctly invalidate its render when its panel has its isChoosable / isSelected override set. Before things like selecting cards in a draft view would not visibly have an effect as the render wasn't invalidated.
 2016-09-06 18:15:37 -06:00
Mark Langen
f9e088b51d Card Rendering name & type line fixes 
* Changed Name and Type line rendering to use Arial / Arial Narrow instead of Beleren. At small font sizes, those fonts are much more readable.

* The P/T box still uses the Beleren font, as the numbers in that font are quite readable even at small sizes.

* Changed the name / type lines to switch between Arial and Arial Narrow depending on whether there is space available using Arial or not.
 2016-09-06 17:03:28 -06:00
fireshoes
32fd253624 [KLD] Added 9/6 spoilers to mtg-cards-data.txt. 2016-09-06 11:06:02 -05:00
emerald000
5c5d6365d8 [KLD] Implemented Crew. Added 2 cards using it. 2016-09-06 03:18:47 -04:00
emerald000
90a55eddb7 [KLD] Implemented Fabricate. Added 3 cards using it. 2016-09-06 02:26:55 -04:00
emerald000
bc0f53973d Added an easier way to put custom text on buttons in a chooseUse prompt. 2016-09-06 02:07:59 -04:00
fireshoes
d70f424d1b [KLD] Added 9/5 spoilers to mtg-cards-data.txt and implemented a few cards. 2016-09-06 00:27:44 -05:00
Samuel Sandeen
eb89781154 Don't check for event validity in Karn's Ultimate 
Karn Liberated should not check whether it’s valid before putting the
Commanders where they belong. Technically any operations after Karn’s
ultimate goes off are invalid if strict checks are made.
 2016-09-05 22:17:04 -04:00
Samuel Sandeen
34846170c4 Remove an unused argument to Player.putInGraveyard 2016-09-05 11:47:52 -04:00
spjspj
41ff4cf595 Merge pull request #2228 from spjspj/master 
spjspj - Slight fix for colours of tokens
 2016-09-06 01:43:35 +10:00
spjspj
f6d06c895e spjspj - Slight fix for colours of tokens 2016-09-06 01:41:04 +10:00
LevelX2
0322f882a9 Merge pull request #2227 from ingmargoudt/master 
refactor : removed all instances of new Random() and replaced with Ra…
 2016-09-05 17:32:07 +02:00
Samuel Sandeen
db3c2e9d8c Clean up an inconsistency in ZoneChangeEvent handling 
Some places set a bit on the ZoneChangeEvent if a permanent was meant
to enter the battlefield tapped but only MeldCard ever read that bit to
determine whether things should come into play tapped.
 2016-09-05 09:51:32 -04:00
ingmargoudt
e2a479255a refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer 2016-09-05 15:03:47 +02:00
LevelX2
23433e82f0 Merge pull request #2226 from Derpthemeus/pull1 
Implement 6 cards, fix Living Armor
 2016-09-05 10:03:53 +02:00
fireshoes
f2cc8d4571 Removed Nissa vs Ob Nixilis from ignored images. 2016-09-04 23:06:13 -05:00
fireshoes
b9d29d3ebf Added upcoming sets. [KLD] Updated mtg-cards-data.txt. Added some simple cards. 2016-09-04 22:54:05 -05:00
fireshoes
a143d86e92 Merge origin/master 2016-09-04 11:27:11 -05:00
Matt Oslan
f8c1a46645 Implement The Brute 2016-09-04 11:56:35 -04:00
Matt Oslan
7803847f4b Implement Iron Lance 2016-09-04 11:55:30 -04:00
Matt Oslan
ce7c3d99a1 Implement Run Wild 2016-09-04 11:55:11 -04:00
LevelX2
3d19637e85 Added test for Oracle of Dust activated ability. 2016-09-04 17:41:33 +02:00
LevelX2
133f043411 * Orcish Spy - Fixed that the activated ability did not work. 2016-09-04 17:17:34 +02:00
LevelX2
507ddd8711 * Necromancer's Magemark - Fixed replacement effect that was coded as triggered ability. 2016-09-04 17:14:27 +02:00
Matt Oslan
87fa888852 Fix return value of LivingArmorEffect 2016-09-04 10:39:12 -04:00
Matt Oslan
9b1dd2ceeb Merge origin/master into pull1 2016-09-04 10:36:11 -04:00
fireshoes
16c40d0248 Merge origin/master 2016-09-04 09:13:47 -05:00
fireshoes
5e911ca63c Updated image sources for upcoming sets. 2016-09-04 09:08:46 -05:00
spjspj
b0d5a9312a Merge pull request #2225 from spjspj/master 
spjspj - Implement new token source (mtg.onl) for downloading of
 2016-09-04 22:37:07 +10:00
spjspj
fb5087683f spjspj - Implement new token source (mtg.onl) for downloading of tokens to tokenDescriptor format in TOK.zip 2016-09-04 22:34:43 +10:00
Samuel Sandeen
c58ad022d7 Merge remote-tracking branch 'magefree/master' 2016-09-04 07:36:31 -04:00
LevelX2
e43333aece * Mayael's Aria - Fixed that the +1/+1 counter was added to every controlled permanent instead of only creature permanents. 2016-09-04 11:01:42 +02:00
LevelX2
8abac8803e Merge pull request #2222 from Derpthemeus/pull2 
Implement 10 cards
 2016-09-04 09:36:20 +02:00
LevelX2
9e20efa444 Merge pull request #2224 from Dilnu/master 
Improve Counter and Zone code
 2016-09-04 09:35:18 +02:00
LevelX2
2c1bce4407 Merge pull request #2223 from maxlebedev/master 
Added Vernal Equinox
 2016-09-04 09:31:52 +02:00
Matt Oslan
0f66d41744 Implement Rushwood Elemental 2016-09-03 23:36:48 -04:00
Matt Oslan
dcf5a0593a Implement Soothing Balm 2016-09-03 23:35:55 -04:00
Matt Oslan
f78d79e914 Implement Tonic Peddler 2016-09-03 23:35:32 -04:00
Samuel Sandeen
ac4658576b Remove Skullbriar 
There are still too many changes required before it can be implemented.
 2016-09-03 20:24:05 -04:00
Samuel Sandeen
434be545f7 Merge remote-tracking branch 'magefree/master' 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
 2016-09-03 20:06:33 -04:00
Samuel Sandeen
ef5ed5256a Clean up the deprecated moveCards methods in Player 2016-09-03 20:04:12 -04:00
Matt Oslan
a58432ac3f Change Minions' Murmurs from damage to life loss 2016-09-03 17:04:27 -04:00
Samuel Sandeen
bec11804f5 Make the handling of counters more consistent. 
This dramatically reduces the code duplication around counters handling.
 2016-09-03 16:52:41 -04:00
Styxo
adf95f1db5 Merge origin/master 2016-09-03 22:40:18 +02:00
Styxo
66f785dd71 Fixed AddCountersTargetEffect 2016-09-03 22:34:45 +02:00
Max Lebedev
1bae15ab11 Merge https://github.com/magefree/mage 2016-09-03 16:05:33 -04:00
Max Lebedev
ecd1985dab implemented Vernal Equinox 2016-09-03 16:04:22 -04:00