bugfi5h
72ec960c95
Merge branch 'develop' into feature/CopperAngel
2017-05-01 15:10:56 +02:00
spjspj
3f125db074
Merge pull request #3271 from spjspj/master
...
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…
2017-04-30 11:15:54 +10:00
spjspj
0d0fccc105
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first.
2017-04-30 11:14:24 +10:00
LevelX2
3cc157bc2c
* Fixed null pointer exception problems in client.
2017-04-30 00:07:37 +02:00
spjspj
04f298923c
spjspj - Add in Tokens to the Card Viewer (fix)
2017-04-29 17:42:08 +10:00
spjspj
241691b153
spjspj - Add in Tokens to the Card Viewer (first version)
2017-04-29 17:25:54 +10:00
bugfi5h
217e294470
Added Card: Copper-Leaf Angel
2017-04-27 21:25:30 +02:00
igoudt
05785f71b9
Make the implementations of CardImageSource an enum
2017-04-27 10:57:48 +02:00
igoudt
3f47d5a253
put inputstream in try body so it can be autoclosed
2017-04-27 10:57:48 +02:00
igoudt
0528555075
make DefaulActionCallback an enum and remove unused parameter
2017-04-27 10:57:48 +02:00
igoudt
ce26e5c8dd
make the combatmanager an enum
2017-04-27 10:57:48 +02:00
igoudt
5b21f34941
rewrote gettypetext, added removeIf to TableModel
2017-04-27 10:57:48 +02:00
igoudt
27aea04820
move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription
2017-04-27 10:57:48 +02:00
Derek M
c4330415c1
Merge pull request #3241 from drmDev/master
...
Unit test confirming issue #3195 with Combat Celebrant
2017-04-25 22:09:14 -04:00
drmDev
04746c5f4f
Unit test confirming issue #3195 allowing Celebrant to attack while exerted
2017-04-25 22:07:51 -04:00
igoudt
c1ce821340
fix on playertype enum comparison
2017-04-26 00:37:06 +02:00
spjspj
4c85d89b64
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 20:12:21 +10:00
spjspj
a4e7c2b407
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 18:17:28 +10:00
spjspj
4ed9419cbf
Fill in missing str
2017-04-23 23:47:43 +10:00
spjspj
6ab4a94bd7
spjspj - Add in 'View Current Deck' option.
2017-04-23 13:06:09 +10:00
spjspj
8845d77628
spjspj - Remove View Limited Deck option
2017-04-22 19:35:08 +10:00
spjspj
0cd4e06e22
spjspj - Add a View Limited Deck option to allow you to see your deck during matches.
2017-04-22 19:16:12 +10:00
fireshoes
a86a1ebf5f
Added Iconic Masters to known-sets/mtg-sets-data.txt
2017-04-20 10:37:16 -05:00
fireshoes
ad3e5749f5
Added Planeswalker Decks to Sample Decks.
2017-04-19 11:46:20 -05:00
spjspj
7ca5adff89
Merge pull request #3169 from spjspj/master
...
Undo double tap of ok button (Leading to duplicate tournaments - Fixe…
2017-04-19 10:31:18 +10:00
spjspj
5373997b30
Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154 )
2017-04-19 10:30:40 +10:00
fireshoes
2c9c4888cc
Added Commander 2017 to known sets.
2017-04-18 11:39:47 -05:00
spjspj
cdd010ffa2
spjspj - Add in saved configurations for New Match and New Tournament dialogs.
2017-04-18 01:52:04 +10:00
spjspj
1fcb7d2963
Revert
2017-04-17 20:00:56 +10:00
LevelX2
ef4cf90a0f
Release 1.4.23V0
2017-04-17 10:53:59 +02:00
LevelX2
35791ac6b7
Set SocketWriteTimeout to 10 seconds.
2017-04-17 00:01:39 +02:00
LevelX2
ed341528d9
[AKH] Fixed that Aftermath card images were shown wrongly rotated.
2017-04-16 22:57:08 +02:00
Styxo
ee9613fa49
[AKH] Fixed wrong card names from MythicSpoiler download
2017-04-16 16:26:10 +02:00
LevelX2
e93218946c
[AKH] Fixed dwonload of Aftermath images from Mythicspoilers.
2017-04-16 14:07:21 +02:00
spjspj
7937bcda9e
Revert
2017-04-16 20:06:27 +10:00
LevelX2
bebb2a4de7
Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?).
2017-04-15 18:51:54 +02:00
Mark Langen
77586eec7e
Add 30 AKH card implementations
...
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
2017-04-15 04:24:14 -06:00
Mark Langen
b1ed5c3632
Fixed deck editor Drag & Drop
...
* Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).
2017-04-14 17:07:52 -06:00
fireshoes
0c9ad1e8b2
[AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas.
2017-04-13 10:10:59 -05:00
ingmargoudt
fea477dd04
fixed two lines to allow playing human-human tables
2017-04-11 07:54:54 +02:00
Mark Langen
c22a8f717e
Fix for problem introduced in 321f5597b7
...
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
2017-04-10 16:13:42 -06:00
Mark Langen
321f5597b7
Change main client window MagePanes from JInternalFrames to JLayeredPanes
...
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
2017-04-07 22:08:13 -06:00
ingmargoudt
1649530e7b
remove helper functions from cardUtil
2017-04-07 16:40:38 +02:00
ingmargoudt
314316f42f
moved inputstream for font to try clause
2017-04-07 15:19:11 +02:00
ingmargoudt
f519b12d0e
introduced isCreature/isLand/isArtifact/... etc for CardView
2017-04-07 15:08:28 +02:00
ingmargoudt
08197f192c
remove CardHelper class
2017-04-07 10:00:16 +02:00
ingmargoudt
d60e01d497
move CardHelper::getColor to CardView::getColorText
2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7
remove isCreature from CardHelper, move to Cardview
2017-04-06 22:07:59 +02:00
Mark Langen
047449f14e
* Correct type line rendering for split cards with different types on each half.
...
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
2017-04-04 21:58:52 -06:00
Mark Langen
a2e8cedd02
Merge branch 'master' into akh-card-frame
2017-04-04 18:36:37 -06:00
