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
Mark Langen
fd73fd39af
Addressed Feedback and added cards
...
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
2017-04-04 17:07:59 -06:00
ingmargoudt
ff6d1541c3
clientcallbacks to enums
2017-04-04 21:52:15 +02:00
Mark Langen
18663f0a7a
Amonket Aftermath ability and card frame changes Completed
...
* Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work)
* Aftermath Card Frame rendering complete
* Normal Split and Fuse Split card frame rendering complete
* Amonket Split card CMC changes NOT made, but left for a separate commit
2017-04-04 00:29:54 -06:00
Mark Langen
a96a7f89f5
Work in progress changes for Amonket Aftermath ability.
...
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
2017-04-03 04:15:25 -06:00
ingmargoudt
211d433ea9
playertype, enum singleton
2017-04-02 22:09:20 +02:00
LevelX2
2446abcc98
* Some minor changes to sleep command.
2017-04-02 11:48:05 +02:00
LevelX2
5a072ea760
* Some minor changes to sleep command ( fixes #2992 ).
2017-04-02 11:32:25 +02:00
ingmargoudt
6f8f10fcc3
move static function to CardImpl, and other api fixes
2017-03-30 20:09:47 +02:00
fireshoes
1bf2d1782c
[MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates
2017-03-29 10:42:43 -05:00
fireshoes
55b433ae36
[AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards.
2017-03-28 22:25:29 -05:00
ingmargoudt
5cd1b5880f
fix supertype on the client
2017-03-27 22:20:19 +02:00
ingmargoudt
0879298e92
refactor cards to use supertype enum
2017-03-27 21:56:33 +02:00
Achilles
b4a60555fc
Revert "Change for id str"
...
This reverts commit 1e8216c5c5
2017-03-24 17:06:33 -05:00
spjspj
1e8216c5c5
Change for id str
2017-03-24 08:14:17 +11:00
vraskulin
d3214c65e4
Merge remote-tracking branch 'fork/master'
2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc
Equals should be compared with == but not equals()
2017-03-22 14:50:50 +03:00
vraskulin
c783614cba
NotifyAll
2017-03-20 15:17:30 +03:00
vraskulin
f37c823aa8
String + string concatenation can be replaced by string + char concetenation
2017-03-20 14:00:18 +03:00
vraskulin
1fa9d4a4f6
Typo
2017-03-20 11:34:44 +03:00
ingmargoudt
ff6c6405aa
rewrites to optionals
2017-03-19 19:48:32 +01:00
LevelX2
ee5675a0fc
Fixed wrong client preferences tab reference.
2017-03-19 10:28:12 +01:00
spjspj
bce87e41aa
Merge pull request #2976 from spjspj/master
...
Add information to inform which images are missing.
2017-03-17 22:40:52 +11:00
spjspj
678b7b5a60
Add information to inform which images are missing.
2017-03-17 22:40:33 +11:00
spjspj
a29963cd80
Add information to inform which images are missing.
2017-03-17 22:37:42 +11:00
ingmargoudt
2b91b88551
fixing some additional singleton classes
2017-03-16 09:48:02 +01:00
ingmargoudt
234cfe9519
rewrote singleton to enum where applicable
2017-03-14 16:32:47 +01:00
spjspj
ce3ada66c8
Merge pull request #2967 from spjspj/master
...
Slight fix for C16 WUBR deck
2017-03-14 22:23:02 +11:00
spjspj
e72e879959
Slight fix for C16 WUBR deck
2017-03-14 22:18:06 +11:00
LevelX2
ae4125209b
Fixed a problem that hybrid mana symbols were not shown ( fixes #2962 ).
2017-03-12 16:59:54 +01:00
ingmargoudt
1f215cdbe3
removed autoboxing :
...
Boolean -> boolean
Integer -> int
Float -> float
2017-03-11 15:17:14 +01:00
LevelX2
9d8a8a33f1
Xmage 1.4.22V0
2017-03-11 13:38:55 +01:00
LevelX2
d89dfd4ac3
Added some missing MM3 cards and fixed wrong collector numbers. Allow image download for MM3.
2017-03-11 12:33:59 +01:00
Nathaniel Brandes
ce1f4a3bf8
Phyrexian mana now correctly a payment choice.
...
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.
This fixes trinisphere interactions and should be consistent with the
rules.
2017-03-08 20:03:28 -08:00
ingmargoudt
4aaf73e0d2
changed the type used in ImagePanel from an int to an enum
2017-03-07 22:28:10 +01:00
ingmargoudt
daed944eb6
refactored the SortBy.getByString
2017-03-07 22:06:44 +01:00
JOAC69
c854fc3d1a
Remove trailing space on CardHelper.getType()
2017-03-05 19:10:20 -06:00
ingmargoudt
6b20d352ca
added unit test
2017-03-03 22:28:34 +01:00
ingmargoudt
a0930e3379
missed 2 hashsets to enumsets
2017-03-03 22:14:00 +01:00
ingmargoudt
372584f7ad
changed cardtype from list to enumset
2017-03-03 17:04:32 +01:00
ingmargoudt
d966c82019
change enum equals to == for client
2017-03-01 17:03:11 +01:00
vraskulin
0bc9cf91a8
Minor improvements - StringBuilder now have initial value
2017-02-28 15:26:07 +03:00
vraskulin
11dc1e10f1
Few lambda's and removed explicit type from creating lists and hashmaps
2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5
Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback
2017-02-28 12:40:12 +03:00
vraskulin
04973ea5aa
Checking String for emptiness with .lenght() is preferable since 1.6
2017-02-28 11:46:51 +03:00
vraskulin
498c8cf60c
Made utility classes final to explicitly forbid it's inheritance
2017-02-27 17:03:38 +03:00
vraskulin
f309717616
Merge remote-tracking branch 'fork/master'
2017-02-27 16:33:47 +03:00
vraskulin
af3986df46
All final strings became static - it will give a little perfomance boost, due to not instantiating same string every time
2017-02-27 16:33:32 +03:00
doncarton
a46848791c
Variable name more readeable
2017-02-26 14:36:34 +03:00
Anders Åstrand
f68460603a
Add client-side user ignore list
...
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
2017-02-22 22:16:09 +01:00
ingmargoudt
a1bc43d33e
Merge pull request #2868 from kubikrubikvkube/master
...
Functional interfaces annotation and bugfixes
2017-02-15 20:27:21 +01:00
vraskulin
a15220d51e
Bugfixes with != instead of equals and default toString calls
2017-02-15 19:52:20 +03:00
vraskulin
752392fc46
Functional interfaces should be annotated as functional interfaces
2017-02-15 19:23:12 +03:00
ingmargoudt
c2191227cd
Merge pull request #2861 from kubikrubikvkube/master
...
Bugfix - after 12820b54d4
2017-02-15 16:10:45 +01:00
vraskulin
f1ef3bf68b
Narrowed variables scope.
2017-02-15 16:05:18 +03:00
Plopman
10284642bc
Use spinner instead of combobox for AI skill. Fix #1111 and #118
2017-02-14 21:06:07 +01:00
vraskulin
09da478b38
Bugfix - after 12820b54d4 refactoring arrow does not disappear from the screen. Rollback.
2017-02-13 18:56:26 +03:00
vraskulin
5e410df39e
We should not create additional Strings in loop. It have perfomance impact. Using StringBuilder instead.
2017-02-13 15:03:23 +03:00
ingmargoudt
20b24e3360
Merge pull request #2846 from kubikrubikvkube/master
...
Singleton object should not have map with values that can't be GCed
2017-02-11 20:43:32 +01:00
vraskulin
f99cd21275
Mostly code format fixes.
2017-02-09 18:30:31 +03:00
spjspj
e18695489f
Merge pull request #2849 from spjspj/master
...
Modify userId string
2017-02-09 19:42:29 +11:00
spjspj
0edd01c293
Modify userId string
2017-02-09 19:41:24 +11:00
vraskulin
12820b54d4
Singleton object should not have map with values that can't be GCed
2017-02-08 19:50:57 +03:00
vraskulin
0557b5e89c
list.size > 0 changed to !list.isEmpty
...
We care about if it's empty or not, not about it's size
2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f
All 1-character strings converted to primitives
...
"b" + "r" now changed to 'b' + 'w'. It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
2017-02-06 14:32:51 +03:00
vraskulin
31589778ca
Try/finally refactored to try with resources
2017-02-06 14:32:11 +03:00
spjspj
fa97e4647e
Add field for server console
2017-02-05 14:11:05 +11:00
LevelX2
a5299e3a30
* Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play.
2017-02-03 20:45:47 +01:00
spjspj
64ff81af75
Merge pull request #2825 from spjspj/master
...
Add Canadian Highlander format
2017-01-30 23:58:47 +11:00
spjspj
de6fae8c00
Add Canadian Highlander format
2017-01-30 23:57:59 +11:00
spjspj
f5a28ae7c8
Merge pull request #2821 from spjspj/master
...
Modify the profanity filter to push it back to client side only.
2017-01-28 13:03:51 +11:00
spjspj
8ebed087a5
Modify the profanity filter to push it back to client side only.
2017-01-28 12:28:11 +11:00
spjspj
676d2a54dc
Merge pull request #2820 from spjspj/master
...
Modify the profanity filter to push it back to client side only.
2017-01-27 18:21:04 +11:00
spjspj
70453f1ac3
Modify the profanity filter to push it back to client side only.
2017-01-27 18:19:45 +11:00
spjspj
c2e41640e8
Merge pull request #2819 from spjspj/master
...
Modify the profanity filter to push it back to client side only.
2017-01-27 12:39:37 +11:00
spjspj
f41d81f8e4
Modify the profanity filter to push it back to client side only.
2017-01-27 12:38:31 +11:00
LevelX2
cdf05069d2
Fixed another problem of symbold downloading.
2017-01-21 01:27:35 +01:00
LevelX2
5fe25b0af7
* Fixed some problems with set icon download and displaying.
2017-01-21 00:51:31 +01:00
LevelX2
05940aa481
* Fixed that the render frame of copies of normal cards got the normal card rule box size.
2017-01-19 23:50:20 +01:00
LevelX2
6625bf86be
Xmage 1.4.21V0
2017-01-15 17:44:02 +01:00
spjspj
72e4df539b
spjspj - Send generated password in an email to new users.
2017-01-15 02:57:25 +11:00
LevelX2
0708525cfa
* Fixed a bug that players could not join password protected limited games ( fixes #2784 ).
2017-01-13 22:05:53 +01:00
LevelX2
450eba06e8
Merge pull request #2772 from ingmargoudt/master
...
replaced enum comparison from equals to ==
2017-01-13 17:26:50 +01:00
igoudt
ac8962cb29
replaced enum comparison from equals to ==
2017-01-11 09:53:16 +01:00
vraskulin
cb1b507076
Hotfix (client don't compile) after pr 2762 merged to master
...
There is no ActionListener in import block, so mage-client in current state can't be compiled. Changed ActionListener to lambda
2017-01-11 11:49:19 +03:00
sotovdev
fe7aaedf1c
Merge branch 'master' into bigRefactoring
2017-01-10 15:37:43 +03:00
spjspj
a4275ab658
Deck editor - Add a 'Bling my deck' button.
2017-01-10 22:26:59 +11:00
vraskulin
076840df53
Big refactoring
...
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3) Get rid of unused imports (most of the changes) in whole project classes.
2017-01-09 19:16:53 +03:00
vraskulin
51e5640c8e
We can't invoke equals method on object, that can be null, due it's lead to NPE
2017-01-09 15:17:59 +03:00
LevelX2
ee203cf981
Xmage Release 1.4.20V0
2017-01-08 01:36:05 +01:00
LevelX2
9353c5aa9c
[AER] Some more minor fixes.
2017-01-07 22:22:17 +01:00
spjspj
7a8055172d
spjspj - Allow appending from the clipboard in deck editor
2017-01-08 01:02:01 +11:00
LevelX2
c2852ca233
[AER] Added Battke at the Bridge.
2016-12-31 17:00:00 +01:00
vraskulin
6577e641e6
Deprected methods changed with more up-to-date ones
2016-12-29 14:46:34 +03:00
LevelX2
8075ea2e50
* Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems.
2016-12-27 16:00:22 +01:00
vraskulin
4f81babdfa
Concurrency perfomance boost
...
Parallel execution. Speed increased from 50% (avg in all methods) to 500% (checkForNewCards method)
2016-12-22 18:36:40 +03:00
vraskulin
95242e8cf9
Concurrency perfomance boost
...
Checking if image exist or not now parallel. It took 35-39 seconds to perform, now it takes 13-16 seconds. Planning to make all class method concurrent and reduce client loading time even more.
2016-12-19 15:58:08 +03:00
LevelX2
9400f192b7
Added some more tooltip texts to client menu bar.
2016-12-13 20:30:32 +01:00
LevelX2
712565562e
Fixed start date of some constructed formats (e.g. Frontier missing M15) for deck editor.
2016-12-12 21:23:20 +01:00
spjspj
49d9630c05
Merge pull request #2673 from spjspj/master
...
spjspj - Add new invert selection option
2016-12-13 00:43:50 +11:00
spjspj
946e0c54fc
spjspj - Add invert selection to deck editor
2016-12-13 00:42:57 +11:00
spjspj
24b4bc8e30
spjspj - Add invert selection to deck editor
2016-12-13 00:41:21 +11:00
LevelX2
3d95849c10
Some fixes to the Monarch designation.
2016-12-07 17:14:08 +01:00
Fenhl
96b4a446a9
Fix typo in the Breed Lethality deck
2016-12-05 05:01:26 +00:00
Fenhl
85f9812d72
Fix basic land artwork of C16 precons
2016-12-05 01:59:42 +00:00
ludwig.hirth
d051cb7b42
* Some client menu changes.
2016-12-02 16:06:34 +01:00
spjspj
b7695f7fea
spjspj - 7pt Aus Highlander
2016-12-01 19:01:00 +11:00
LevelX2
b62ca1ed1f
Xmage 1.4.19
2016-11-27 19:59:42 +01:00
LevelX2
68d0e6b9fa
Added the monarch concept to xmage and all related cards.
2016-11-27 01:14:32 +01:00
spjspj
5fe4dcdd29
Merge pull request #2610 from spjspj/master
...
Add 'EDH power level' rating to Commander tables
2016-11-21 19:45:28 +11:00
Pete Rossi
b974a78b1b
Add magidex.com as additional image source
...
Images on magidex are referenced by url-escaped card name, so the
implementation was straightforward. Flipped and Two-faced cards didn’t
require any additional work to support.
I downloaded all the images, and the only missing cards I could see
were tokens. Seems to work pretty well.
Fixes issue #2153
2016-11-20 22:33:08 -08:00
spjspj
7fd2eeedcf
Add 'EDH power level' rating to Commander tables
2016-11-20 23:13:16 +11:00
spjspj
b29e25cb87
Merge pull request #2609 from spjspj/master
...
spjspj - Add concept of 'Multiples' (work out in new edh decks which …
2016-11-19 22:54:01 +11:00
spjspj
49cfaee144
spjspj - Add concept of 'Multiples' (work out in new edh decks which are not singleton).
2016-11-19 22:45:47 +11:00
LevelX2
807782efea
Added the Basque flag.
2016-11-19 10:53:43 +01:00
spjspj
d7b1ae68ed
spjspj - Sorcery count was double
2016-11-18 00:14:59 +11:00
spjspj
a2b3d8825e
Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dialog to fill in appropriate password/username
2016-11-13 22:59:32 +11:00
fireshoes
c8bafff7e3
Added Mirror Mastery to Commander 2011 sample decks.
2016-11-09 08:25:41 -06:00
Fenhl
d5ee37fce8
Add Counterpunch deck from CMD and fix some other precon deck names
2016-11-08 09:46:43 +00:00
LevelX2
c9e1b415e2
Xmage 1.4.18V0
2016-11-06 18:11:19 +01:00
spjspj
cab2993b1b
spjspj - The 5 Commander 2016 Decks
2016-11-07 00:55:03 +11:00
Neil Gentleman
843466b6ad
AudioManager: a bit of cleanup
2016-11-01 21:28:44 -07:00
Neil Gentleman
366e8e281d
MageClip: copy whole input file
...
not just whatever the first read returns
2016-11-01 21:28:44 -07:00
Neil Gentleman
5d55d299a2
don't just give up when LinePool can't be initialized
...
maybe fixes #2525
2016-11-01 21:28:44 -07:00
LevelX2
0f6c14bdb7
Fixed that a client reconnect tries to reconnect to the server the client was connected to and not the last server a client on this system has connected to.
2016-11-01 22:59:24 +01:00
fireshoes
ac3203b63c
Set some token version types. [C16] Added token info. Implemented Migratory Route.
2016-10-31 23:09:42 -05:00
fireshoes
72c13b9102
[C16] Implemented Wave of Reckoning, Duelist's Heritage, Entrapment Maneuver, and Magus of the Will.
2016-10-31 00:10:53 -05:00
SceLPI
0dd1a37891
Update serverlist.txt
2016-10-29 14:56:24 -03:00
LevelX2
3f05e102a0
[C16] Added Boompile.
2016-10-29 11:11:37 +02:00
LevelX2
ec8ea8e053
Allow to dwonload C16 images.
2016-10-29 11:09:09 +02:00
LevelX2
e1ca3b5cc5
* Removed the LogServices (H2 DB file that logs actions).
2016-10-28 18:39:17 +02:00
spjspj
e2afd7b790
Merge pull request #2506 from spjspj/master
...
spjspj - Add in promos from scg to grabbag. Fixed some more issues w…
2016-10-27 22:43:50 +11:00
spjspj
fa36157f69
spjspj - Add in promos from scg to grabbag. Fixed some more issues with names
2016-10-27 22:42:05 +11:00
spjspj
66c379ce6e
Merge pull request #2505 from spjspj/master
...
spjspj - Add in promos from scg to grabbag. Fixed some badly numbere…
2016-10-27 16:07:42 +11:00
spjspj
1dae8ca6b2
spjspj - Add in promos from scg to grabbag. Fixed some badly numbered lands (probably more are bad).
2016-10-27 16:02:00 +11:00
LevelX2
6b58c18520
* Fixed a game locking problem with the day/night button of transformable cards ( fixes #2503 ).
2016-10-26 22:53:39 +02:00
Mat
134dcb6946
Remember Type 2 selection when changing source on images download dialog
2016-10-25 23:09:31 +02:00
LevelX2
8f317305fa
Some minor changes.
2016-10-24 17:55:28 +02:00
LevelX2
070a0ca3fa
* Fixed a problem that the enlarged card view could stay open after a game or draft were finished.
2016-10-23 23:13:02 +02:00
LevelX2
69340d9b06
* Added correct key text to chat info message.
2016-10-23 18:39:39 +02:00
LevelX2
8b62eece68
XMage 1.4.17V0
2016-10-23 10:03:01 +02:00
