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
LevelX2
07a7afa285
Added test and fixed some possible null pointer exception.
2016-10-22 13:06:41 +02:00
Campbell Suter
0428f5bab3
Add reset keys to default button
2016-10-21 09:54:09 +13:00
Campbell Suter
4c292466c1
Make it impossible to have multiple actions bound to the same key.
2016-10-21 09:54:09 +13:00
LevelX2
89a739e902
* Removed debug messages.
2016-10-20 15:16:31 +02:00
Campbell Suter
cde9afa091
Make keybound buttons cache their text, in case the keys are changed midgame
2016-10-20 12:49:58 +13:00
Campbell Suter
b4dc47fbc9
Improve keybinding buttons, add information
2016-10-20 12:36:18 +13:00
Campbell Suter
5ea636126f
Make the text on the playing buttons update with the current keybinds
2016-10-20 12:36:18 +13:00
Campbell Suter
d9ebceec20
Make tooltips work properly
2016-10-20 12:36:18 +13:00
Campbell Suter
e910778e54
Add F2/F6, use bindings in game
2016-10-20 12:36:18 +13:00
Campbell Suter
d7a3904569
Add key options to prefs dialog
2016-10-20 12:36:18 +13:00
fireshoes
89dd981075
Merge
2016-10-17 23:45:47 -05:00
fireshoes
b733f911f7
Added the four finalists from You Make the Cube.
2016-10-17 23:44:14 -05:00
fireshoes
c045204622
Added the four finalists from You Make the Cube.
2016-10-17 23:43:25 -05:00
fireshoes
abfcd0ab10
Added the four finalists from You Make the Cube.
2016-10-17 23:41:22 -05:00
fireshoes
1f4c0eb1d9
Added the four finalists from You Make the Cube.
2016-10-17 23:10:01 -05:00
LevelX2
2e1f8c07cb
Xmage 1.4.16v3
2016-10-09 15:54:12 +02:00
LevelX2
27acaa5c9a
Fixed a image cache problem that prevented to show cards with different art correctly.
2016-10-09 15:28:54 +02:00
LevelX2
67cf1604c9
Fixed a problem with images of transformed cards. Workaround for images of basic lands. Does not work correctly yet, because card art od basic lands is switched between various versions continuously.
2016-10-09 03:07:23 +02:00
LevelX2
e46895420e
Added card# to deck pool area.
2016-10-09 03:05:10 +02:00
LevelX2
4ec7d626fa
* Fix to get land images shown again.
2016-10-08 19:03:32 +02:00
LevelX2
5d8ae4d411
* Workaround to fix problem with deck layout.
2016-10-08 19:03:09 +02:00
LevelX2
157827addc
XMage 1.4.16v0
2016-10-08 11:14:13 +02:00
spjspj
be6e900dba
spjspj - Add Media Inserts to Grabbag Image Source
2016-10-08 11:19:05 +11:00
spjspj
30bfeb497d
spjspj - Add Kaladesh Inventions to Grabbag Image Source
2016-10-08 01:40:37 +11:00
spjspj
624bb8da76
spjspj - Show dialog box for import from clipboard
2016-10-07 20:27:26 +11:00
spjspj
250873263c
spjspj - Show dialog box for import from clipboard
2016-10-07 20:15:36 +11:00
spjspj
72b0192bae
spjspj - Fix cube from deck from being broken with layouts
2016-10-07 10:38:56 +11:00
spjspj
56e1a96d76
spjspj - Manifest/Morph image to mtg.onl
2016-10-06 18:45:52 +11:00
spjspj
b63874b62d
Opaque PlayerPanelExt
2016-10-06 00:02:11 +11:00
spjspj
84e26e6677
Opaque PlayerPanelExt
2016-10-06 00:00:20 +11:00
LevelX2
7c4b40073c
Fixed some exception problems (deck layout, mana symbols).
2016-10-04 23:57:11 +02:00
Mark Langen
d604b18f6b
Separate setting for split position in sideboarding vs deck construction
...
* Depending on the orientation of the sideboard / maindeck the split should be a separate setting, not one single one.
2016-10-04 01:18:50 -06:00
Mark Langen
5af417ed0b
More Drag & Drop editor fixes
...
* Fixed cards being blurry. The problem isn't completely fixed, but the fix will suffice in most cases. Card Images are only loaded in once, and the cards were loaded in initially at a small size instead of their eventual size after layout. Really they should reload images when resized, but I will tackle that later, and it's only noticable when significantly resizing cards within one usage of the editor anyways.
* Removed some of the unneeded UI on the sideboard half of the DeckView so that componently are less likely to overlap at a small size. Not sure how to ideally handle this, as Swing doesn't really provide an elegant way to hide components at small sizes, and I'm sure the user would rather the components overlap than be unable to resize the window as small as they want due to a minimum size requirement.
2016-10-04 00:23:13 -06:00
Mark Langen
f6d50ce04f
Various new Drag & Drop deck editor improvements
...
* Shift-Click / Shift-Drag now work as expected as far as multi-selection
* Deck editor saves split pane split positions
* Card layout and sort settings are now saved along side the a deck when saving to the .dck format, so that you have back the exact same deck layout when you re-load the deck.
* Fixed the symbol image downloader to work around some of the large-size symbol images being missing on gatherer. Falls back to the medium sized images currently for those symbols.
2016-10-04 00:09:51 -06:00
spjspj
4d3f28ed6d
spjspj - one more token
2016-10-04 10:01:41 +11:00
fireshoes
7cbb3df889
Fixed that Eternal format matches did not show in the matchmaking lobby.
2016-10-03 16:39:11 -05:00
LevelX2
9a00dd20ca
Fixed some problems with constructed formats definition and custom sets.
2016-10-03 20:25:08 +02:00
LevelX2
bdaa78e144
Some minor changes.
2016-10-03 10:00:48 +02:00
LevelX2
f6839f9e1d
Merge origin/master
2016-10-03 01:43:02 +02:00
LevelX2
fcba98f985
Some minor changes.
2016-10-03 01:42:35 +02:00
fireshoes
002da57ccd
Fixed that Constructed - Freeform format did not appear in the games lobby.
2016-10-02 18:40:45 -05:00
LevelX2
c4b4804903
Fixed that no abilitues were shown for selecting the order of triggered abilities from a dies triggered ability of tokens.
2016-10-02 23:34:06 +02:00
LevelX2
e49c92e80c
Added "E" to the to be replaced symbols with icon in rule text.
2016-09-29 16:20:13 +02:00
spjspj
6ad012fa87
Merge pull request #2405 from spjspj/master
...
spjspj - Player Panel
2016-09-29 23:05:47 +10:00
spjspj
1bbed6dc5f
spjspj - Player Panel
2016-09-29 23:03:57 +10:00
Lymia Aluysia
09cc9646a0
Remove outdated comment.
2016-09-29 06:48:22 -05:00
spjspj
52f6d36063
Merge pull request #2403 from spjspj/master
...
spjspj - Player Panel *fix offset of {W}*
2016-09-29 17:39:51 +10:00
spjspj
fa627a3efb
spjspj - Player Panel *fix offset of {W}*
2016-09-29 17:33:22 +10:00
Mark Langen
a018f2021b
Fixed a bug with JFileChooser in the DeckEditorPanel
...
* On specific platforms (it seems Windows 7-10, JRT 7+), under our specific configuration, in the case where the user selects the exact same file as they chose during a previous selection, JFileChooser reports that the user selected a file, but returns chosen file = null. This commit works around that by assuming they chose the same file as last time in that case.
2016-09-28 23:27:46 -06:00
Mark Langen
615b93f8c3
Finished the new Drag & Drop deck view. It is currently implemented in main deck editor, and limited deck construction.
...
Still to do:
* Integrate it into the draft view
2016-09-28 20:57:23 -06:00
Mark Langen
56a3c6dc8c
Mostly working Drag n Drop deck editor
...
* Still trying to iron out how to signal back events from cards moving between different drag and drop targets to the DeckEditorPane
2016-09-28 20:57:22 -06:00
Mark Langen
3c2c793f5d
Drag n Drop Deck Editor WIP
...
* Working standalone proof-of-concept application in DragCardGrid.
* Still needs listener functionality in order to integrate it into the existing DeckEditorPanel class.
2016-09-28 20:57:22 -06:00
Mark Langen
2d55ccc73c
Change "Ask for graveyard order" setting to not ask by default
...
* The cases where graveyard order matters are so staggeringly few that that the setting should almost certainly default to false.
2016-09-28 20:57:21 -06:00
spjspj
458cbfa71a
spjspj - Further changes to height of Player Panel.
2016-09-28 23:27:15 +10:00
spjspj
5b941d4c5e
spjspj - Make zero values less noticeable on player panel
2016-09-28 22:58:55 +10:00
spjspj
240c7950d0
Merge pull request #2386 from spjspj/master
...
spjspj - Add in energy/experience counters
2016-09-27 17:50:26 +10:00
spjspj
de3c3ae036
spjspj - Add in energy/experience counters
2016-09-27 17:49:34 +10:00
fireshoes
783a278fca
Added Frontier format (M15 forward). Added Kaladesh block constructed.
2016-09-27 01:54:49 -05:00
spjspj
1a81f2151f
spjspj - Add in energy/experience counters
2016-09-26 03:17:06 +10:00
spjspj
d259efc093
spjspj - Add in energy/experience counters
2016-09-26 03:01:35 +10:00
spjspj
5671ab8ff7
spjspj - Add in energy/experience counters
2016-09-26 02:58:59 +10:00
spjspj
db3074ceda
spjspj - experience.png resource (candidate for a more gooderer one..)
2016-09-26 02:50:37 +10:00
spjspj
80b498f044
spjspj - Energy.png resource
2016-09-26 02:45:20 +10:00
spjspj
16bb17e5bb
spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it.
2016-09-25 00:46:16 +10:00
LevelX2
b85dc8c0cd
Some minor changes.
2016-09-24 14:55:09 +02:00
LevelX2
4c91440f5e
Chnaged color frame for active player to green (that white was a no go).
2016-09-22 21:48:39 +02:00
LevelX2
b7f3a4b202
Merge pull request #2321 from getgrenade/master
...
Player Panel UI redesign (new icons, new colors, new buttons)
2016-09-22 19:55:20 +02:00
spjspj
e22184180d
spjspj - Add 'Delayed Submit' button to the deck editor
2016-09-20 01:49:51 +10:00
Get
ed7378da66
Player Panel UI redesign (new icons, new colors, new buttons)
2016-09-18 17:10:54 +03:00
spjspj
88b557e1b2
Merge pull request #2317 from spjspj/master
...
Some minor fixes for grabbag
2016-09-18 20:22:00 +10:00
spjspj
8cf4acb68a
Some minor fixes.
2016-09-18 20:20:04 +10:00
Fenhl
ab7e86cb27
Change AE to Ae
2016-09-17 16:59:24 +00:00
LevelX2
04ca15a3a9
Some minor fixes.
2016-09-17 16:45:53 +02:00
Mark Langen
7feb237c06
Fixed card stacking offset in Editor / Library / etc.
...
* Rather than respecting the spacing setting from Preferences, the spacing is now calculated from the card size if characteristic based rendering is enabled, since from the renderer we know exactly what spacing is actually needed.
2016-09-16 16:41:00 -06:00
Mark Langen
28c04e2009
Fix cards still not showing selectable highlight in some cases
...
* Simply invalidating the image render is not enough, a repaint call is also needed in a few cases where a repaint hadn't already been scheduled by the same change that trigged the selectable/chosen status change.
2016-09-16 16:41:00 -06:00
LevelX2
d7dd635bca
Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…"
2016-09-16 23:55:54 +02:00
ingmargoudt
f1cf9e7adb
introduced StringUtil class with .isEmpty(String input) and .isNotEmpty(String input), to replace str != null && str.length()>0 statements
2016-09-16 21:23:31 +02:00
ingmargoudt
71398d6d83
added some missing session references
2016-09-16 08:58:44 +02: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
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
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
f6ef3db9b9
* Added some missing static SessionHandler usages.
2016-09-15 22:30:41 +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
spjspj
a0c09ecf6a
spjspj - Add 'grab-bag' of images that seem harder to get.
2016-09-16 01:41:10 +10: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
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
ingmargoudt
3128bd2b4b
replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead
2016-09-14 15:27:31 +02:00
spjspj
4a15228bf2
spjspj - Add alternative SCG tokens from alternative.mtg.onl
2016-09-14 02:13:01 +10:00
spjspj
08df195bc3
spjspj - Fix for mtg.onl
2016-09-14 00:38:24 +10: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
Mark Langen
610c4789e5
Fixed card rendering breaking when view is missing set code. Real issue is #2260 , but that will take more work to fix.
2016-09-12 23:25:48 -06:00
fireshoes
6ea98ba19b
[KLD] Updated mtg-cards-data.txt with spoilers through 9/12. Add Masterpiece Series set and 4 known reprints so far.
2016-09-12 14:02:48 -05:00
Roy Klein
1e39c99914
Add support for .dek files
2016-09-11 23:34:17 +02:00
spjspj
c5577dc09e
d'oh
2016-09-12 01:13:16 +10:00
spjspj
3bbf5d1d56
spjspj - Add in last ditch token attempt (for momir vig mainly)
2016-09-12 01:00:43 +10:00
LevelX2
bb8326d46b
XMage 1.4.15v0
2016-09-10 12:31:18 +02:00
Mark Langen
8d90f4558d
Merge pull request #2234 from stravant/master
...
Characteristic-Based rendering initial release completed unless further bugs come up before then.
2016-09-07 23:16:10 -06:00
Mark Langen
26b98d1afb
Added more card text sizes. And other small fixes.
...
* Changed card rules text rendering to use 5 total possible text sizes to better support HD+ display resolutions.
* Made a P/T box be shown on vehicles.
* Small bugfixes, fixing crashes when characteristics like type line or name are missing for whatever reason.
2016-09-07 22:35:14 -06:00
Mark Langen
a638625c77
Fixed full-arts seemingly not replicating properly
...
* The problem was that they key for caching rendered cards did not take into account the full art / not full artness of the cards, so when someone has both full art and non-full art variants of a land from the same set it one would override the other.
2016-09-07 17:35:05 -06:00
Mark Langen
f0a1938b3e
Full art Land rendering
...
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)
* Added support for rendering based off of frameStyle
* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
2016-09-07 02:20:51 -06:00
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
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
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
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
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
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
LevelX2
720a4457fd
* Fixed hybrid mana symbol display for characteristic-based card rendering. Removed not used import statements.
2016-09-03 10:52:14 +02:00
Mark Langen
629da22dd9
Small fix to renderer.
2016-09-01 17:23:17 -06:00
Mark Langen
b2895ee9eb
Tweaked layout for small card text.
2016-09-01 16:13:28 -06:00
Mark Langen
463576dbd0
Merged up to current
2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535
* Textual set symbols no longer displayed if set symbol image doesn't exist.
...
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
2016-09-01 15:00:46 -06:00
spjspj
0f043d480d
spjspj - Implement new method for image generation of tokens.
2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e
Most obvious bugs ironed out. Ready for PR.
2016-08-31 23:37:31 -06:00
Mark Langen
d5415d2d04
Working Card Rendering
2016-08-31 04:43:28 -06:00
spjspj
4bf78fd6d4
Update devs
2016-08-19 19:45:23 +10:00
LevelX2
873ecddb1d
Fixed that token images were not loaded.
2016-08-15 11:13:06 +02:00
LevelX2
539b03bd1d
Xmage 1.4.14v0
2016-08-13 10:14:38 +02:00
fwannmacher
9b5a02c09c
- Fixed issue #2075
2016-08-04 09:52:56 -03:00
LevelX2
a0fbcddeb9
* Added preference option to set the size of the enlarged image popup window.
2016-08-02 12:00:36 +02:00
fireshoes
88e8894b29
Added Duel Decks: Nissa vs Ob Nixilis and From the Vault: Lore.
2016-08-01 15:05:25 -05:00
Quercitron
c04bd6d64a
Replace Yes/No text with Mulligan/Keep text on mulligan answer buttons to make options more clear.
2016-07-31 15:57:45 +03:00
Derek M
86e7ace06e
Merge pull request #2112 from fwannmacher/master
...
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
2016-07-25 16:24:01 -04:00
spjspj
883b63a01d
spjspj - Update to push deck List across from Client to Server for Custom Cube
2016-07-25 22:44:21 +10:00
fwannmacher
10778cdd6b
- Converted CardImpl.cardNumber from int to String
...
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
2016-07-24 15:18:54 -03:00
fwannmacher
78f327e822
- Fixed more image url properties
2016-07-21 01:19:28 -03:00
fwannmacher
9861f762b7
- Added option to select number of threads for image download
2016-07-20 16:08:36 -03:00
fwannmacher
8c1e7ec42e
- Fixed some image url properties
2016-07-20 14:23:22 -03:00
fireshoes
9630320ba9
Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs.
2016-07-18 15:49:43 -05:00
Quercitron
91f74ced1f
Add downloading of double-faced cards from the mythicspoiler.com
2016-07-12 03:31:08 +03:00
LevelX2
d0ecb473da
Xmage 1.4.13v0
2016-07-11 22:54:43 +02:00
LevelX2
8e76430d07
Revert "Use a dedicated thread pool for audio"
2016-07-10 22:01:06 +02:00
fireshoes
4cf3f29c4c
[EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints.
2016-07-08 11:18:14 -05:00
spjspj
26d38f0773
spjspj - Add the option of having a .dck file as a cube
2016-07-04 00:20:31 +10:00
LevelX2
ce91f6aae7
Fixed a problem with transformed image cache.
2016-07-02 19:07:26 +02:00
LevelX2
1c2aa4c10a
Fixed cleint exception problem with transformable cards.
2016-07-02 18:38:29 +02:00
LevelX2
7cfdd80c57
Chnaged permanent row handling so creatures are always shown towards the opponent side.
2016-07-02 13:45:34 +02:00
LevelX2
e9993f980a
Added workaround to deck generator to handle missing basic lands.
2016-07-02 13:44:36 +02:00
LevelX2
2874996994
Merge pull request #2032 from draxdyn/hold_priority
...
Hold priority on Ctrl+click
2016-07-01 16:00:20 +02:00
LevelX2
3b0f7b074f
* Some changes to distance calculation of enchantments on the battlefield. Added minimal permanet size preference setting (not working correctly yet).
2016-07-01 15:08:40 +02:00
fireshoes
33ac32f5c4
[EMN] Added additional 6/30 spoilers to mtg-cards-data.txt. Added some more cards.
2016-06-30 14:47:59 -05:00
draxdyn
a7409f3d08
Hold priority on Ctrl+click
...
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.
Hence, automatically passing priority is the only comfortable setting.
However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.
This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.
A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.
The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.
The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.
This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.
It is also possible to hold priority and stop holding priority using
the context menu.
2016-06-29 19:57:45 +02:00
drmDev
9deb1bd0da
Ignition Team implementation (requested card)
2016-06-29 03:21:40 -04:00
LevelX2
facd5ffa2c
Merge pull request #2028 from draxdyn/cardpanel_threading
...
Fix broken threading in CardPanel
2016-06-28 13:28:37 +02:00
LevelX2
0733729382
Merge pull request #2029 from draxdyn/audio_threadpool
...
Use a dedicated thread pool for audio
2016-06-28 13:27:18 +02:00
LevelX2
d220c739a8
Merge pull request #2030 from draxdyn/performance
...
Improve GUI performance
2016-06-28 13:26:44 +02:00
LevelX2
f7cecdf050
Merge pull request #2033 from draxdyn/f6
...
Add support for F6
2016-06-28 09:16:09 +02:00
LevelX2
c505c2f44f
Merge pull request #2027 from draxdyn/resize_editor
...
Update image when cards in editor are resized
2016-06-28 09:08:37 +02:00
draxdyn
62d5d45a45
Add support for F6
...
Skips everything until next turn, except for declare attackers and blockers.
F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.
There is currently no GUI button for it.
2016-06-24 21:34:30 +02:00
spjspj
157d94360c
spjspj - Modifications to shrink size of players who have left.
2016-06-24 19:20:46 +10:00
draxdyn
053580c412
Add support for disabling animations
2016-06-23 16:21:34 +02:00
draxdyn
b8e5f5f942
Draw CardPanel to a buffered image and cache it across instances
...
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
892cfdce45
Draw MageRoundPane and its shadow to a buffered image and cache it across instances
...
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
ffb65d48fe
Draw GlowText to a buffered image and cache it across instances
...
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
4b190eeaf4
Drastically simplify ScaledImagePanel by having it just use the resized image cache
...
All the current behavior of ScaledImagePanel seems to be useless, since the source
images are static, so we can just use the highest quality scaling possible and
cache the result using TransformedImageCache.
2016-06-23 16:21:34 +02:00
draxdyn
e3d84ca212
Cache resized and rotated images
...
RotatedResizedImageCache and MultiRotatedResizedImageCache contain the caching
machinery.
A cache of rotated and resized images is added to ImageCache, and is used by
the resizing functions there.
All the resizing and rotation functions in ImageHelper are redirected to the
ones in ImageCache.
This is slightly inefficient because it will cache some calls that are never
repeated, but it prevents developers from mistakenly using uncached functions
when calls are repeated, seriously impacting performance.
Also resizing functions that only take a width or an height have been removed,
and their calls fixed to provide the other dimension. It's still possible to
specify -1 as width or height to ignore constraints in that dimension, though.
Greatly speeds up UI performance.
2016-06-23 16:21:34 +02:00
draxdyn
1999dfe5c0
Add mechanism to register image caches and flush them all on GUI size change
...
This should avoid the issue of having lots of unused entries in caches if the
GUI size is changed multiple times.
2016-06-23 16:21:34 +02:00
draxdyn
415c8cce7e
Don't call setText() on the popup text component until it is shown
...
Performance improvement, impacts profiles.
2016-06-23 16:21:34 +02:00
draxdyn
9513b5bf74
Don't call setText in MageTextArea if the text hasn't changed
...
Minor UI speedup, shows up in profiles for simple games.
2016-06-23 16:21:34 +02:00
draxdyn
8c2c1f4887
Don't call setEditable in ColorPane
...
Shows up in profiles, and should be unnecessary.
2016-06-23 16:21:34 +02:00
draxdyn
0b13660348
Use mouse point in event instead of calling getMousePosition()
...
Improves performance and is also the correct way to do this.
2016-06-23 16:21:34 +02:00
draxdyn
d8b791a506
Use a dedicated thread pool for audio
...
Audio threads are busy while the sound plays, which could be several seconds,
potentially stalling other tasks competing for the thread pool.
So use a dedicated thread pool, which also allows to have it sized based
on the number of the audio lines.
2016-06-23 16:16:48 +02:00
draxdyn
1dddda6599
Fix broken threading in CardPanel
...
The current code is broken, can't touch the UI in a thread pool thread,
UI.invokeLater must be used to get back on the UI thread.
Also, it must check whether the card has been changed again before setting
the image and do nothing in that case.
2016-06-23 16:12:15 +02:00
draxdyn
5c177dcdc8
Update image when cards in editor are resized
...
Currently images are blurred when changing GUI size in the editor,
and this fixes the issue.
2016-06-23 16:01:47 +02:00
Quercitron
207961ee5f
Fix that isType2 flag was not set for second sides of transform cards and flipped cards in the pictures download.
2016-06-22 13:10:42 +03:00
LevelX2
f691017cda
* Gryff's Boon - Fixed that the target was wrongly selected during resolution.
2016-06-19 16:13:50 +02:00
LevelX2
84989973ed
Merge pull request #2001 from draxdyn/fix_oobe
...
Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed
2016-06-17 13:45:03 +02:00
LevelX2
469febfafd
Merge pull request #2000 from aastrand/aastrand/password
...
Add TablesPanel filter for passworded games
2016-06-17 13:44:23 +02:00
LevelX2
5d1b96e4c9
Merge pull request #1986 from draxdyn/clicks
...
Recognize double clicks made in rapid succession
2016-06-17 13:42:38 +02:00
spjspj
8c017fe3d2
Merge pull request #2002 from draxdyn/getwizardsimage_npe
...
Fix NPE in getWizardsCard
2016-06-16 12:16:02 +10:00
draxdyn
54a7be59d0
fix NPE in getWizardsCard
2016-06-15 13:11:40 +02:00
Kranken
c445270783
Make password filter behave nice with settings
2016-06-15 00:03:22 +02:00
Kranken
9fee893ed1
Add TablesPanel filter for passworded games
...
This commit makes passworded a first class property of
TableView as well as adds filtering capabilities
of open and passworded games. Useful for hiding
passworded games when looking for open play and
useful for hiding open games when playing vs
a friend on a busy server.
2016-06-14 23:19:17 +02:00
draxdyn
d671a22398
Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed
...
Don't call convertRowIndexToModel with a -1 row.
2016-06-14 18:31:33 +02:00
draxdyn
0b8404f0a4
Recognize double clicks made in rapid succession
...
Currently they are not recognized, because getClickCount() will be
higher than 2 since Java interprets them as quadruple, sextuple, etc. clicks.
So, instead of checking for getClickCount() == 2, check for getClickCount()
being an even number.
This allows to quickly remove or add many cards to a deck.
2016-06-14 13:02:51 +02:00
Alex Marcotte
a7e29b3fd0
Adding way to import deck from clipboard
2016-06-05 15:06:02 -04:00
LevelX2
266a0870ca
Xmage 1.4.12v0
2016-05-29 10:59:39 +02:00
LevelX2
98fadbd8ba
Merge pull request #1946 from Simown/master
...
Reverted changes to deck generation sliders
2016-05-29 10:19:11 +02:00
LevelX2
9fa0bf7bd2
Swapped main menu position of Feedback and Preferences (so Preferences is always available if you switch to a too big font size).
2016-05-29 09:53:56 +02:00
fireshoes
20ec737a58
[EMA] Added 5/23 spoilers.
2016-05-23 18:38:04 -05:00
Simown
dc10a52caf
Reverted changes to deck generation sliders
2016-05-23 12:31:56 +01:00
LevelX2
f44987aa37
* Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs.
2016-05-22 16:02:10 +02:00
Quercitron
c781728b97
Add rating to the client ( #1498 )
2016-05-17 17:27:43 +03:00
fireshoes
a2c56d821c
Added a bunch of promo cards and the new sets that were announced today.
2016-05-16 23:05:31 -05:00
LevelX2
308c485a67
Merge pull request #1913 from Bitmaximus/master
...
Add tracking for quantity of artifacts in card lists. Add tracking for quantity of card types in graveyard.
2016-05-15 18:15:28 +02:00
spjspj
f9e363fb30
spjspj - Update Rich Man draft to allow Random packs
2016-05-15 23:52:13 +10:00
LevelX2
d9066db141
* Fixed that freeform tables were not shown in thelist of open games.
2016-04-30 12:01:42 +02:00
Liam Speirs
8675e47c88
Add Card-type counter for graveyard label hover and in graveyard Dialog window. (To mirror magic online and to make delirium easier to check)
2016-04-28 00:13:32 -04:00
jeff
043a3b50cc
- Added 2 great decks from the Pro Tour SOI 2016
2016-04-27 16:13:23 -05:00
Liam Speirs
8758c2de36
Add tracking for number of artifacts in card lists.
2016-04-27 14:43:40 -04:00
LevelX2
e2a8ddef0f
Merge pull request #1905 from KWottrich/clean-up-java-imports
...
Clean up java imports
2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60
xmage 1.4.11v0
2016-04-26 00:59:03 +02:00
Kenny Wottrich
f3c83d54f5
Remove Unused Imports
...
Delete unused java imports that cause compiler warnings
2016-04-24 19:50:29 -05:00
drmDev
5ab54142de
W16 fix. Eldrazi Obligator fix and test
2016-04-15 12:24:04 -04:00
drmDev
e136e409fd
[W16] cards added. Still does not show as Standard legal. HELP
2016-04-15 09:15:26 -04:00
Fenhl
430ae503c7
Change all line endings to LF
2016-04-14 16:18:01 +00:00
Jared Hall
3f2611de76
Fixes #1836
2016-04-12 08:16:15 -04:00
spjspj
bfc66ff3f3
spjspj - Further fixes for useFirstManaAbility
2016-04-07 15:29:18 +10:00
spjspj
dacef8db5e
spjspj - Further fix for User First Mana ability. It should be false unless the user explicitly turns it on through ALT+1 or the menu options.
2016-04-07 10:46:29 +10:00
LevelX2
bcdde0a945
XMage version 1.4.10v0
2016-04-06 22:56:02 +02:00
spjspj
822917322c
spjspj - Use first Mana ability fixes
2016-04-05 21:37:04 +10:00
spjspj
e5ca1bd6d2
spjspj - Implement a 'Use the first available mana ability for a land mode'.
...
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
2016-04-04 20:30:28 +10:00
Jared Hall
44388719a6
Fixes #1755
2016-04-03 20:35:59 -04:00
spjspj
85a22ea9d9
spjspj - Add in message for F11 button
2016-04-02 10:13:54 +11:00
spjspj
3dfe9de05f
spjspj - Add the 'Skip to End Step of Previous Player' button to the GamePanel and associated changes
2016-03-27 00:07:23 +11:00
fireshoes
185447c424
[SOI] Added some additional token types. Updated mtg-cards-data.txt with 3/22 spoilers.
2016-03-22 10:18:10 -05:00
fireshoes
b58a0374c6
Added missing Blessed vs Cursed image information. [SOI] Added basic lands, some additional token types and emblems.
2016-03-22 00:05:55 -05:00
rkfg
059b56e11a
Add transparency to highlighted player panel.
2016-03-21 21:49:25 +03:00
rkfg
66a9e5140a
Highlight current player's panel.
2016-03-20 18:42:58 +03:00
rkfg
ae66db20ad
Adjust sliders on reset.
2016-03-17 15:13:29 +03:00
rkfg
981665bcd0
Remove adjust parameter.
2016-03-17 15:13:28 +03:00
rkfg
74f925b579
Fix deck generator sliders.
2016-03-17 06:30:21 +03:00
rkfg
eec3e779bd
Simplify controlling of advanced deck generator sliders.
2016-03-17 03:19:20 +03:00
fireshoes
0a38430d49
[SOI] Added 3/14-15 spoilers to mtg-cards-data.txt Added Angel of Deliverance, Anguished Unmaking, Descend upon the Sinful, Drogskol Cavalry, Nephalia Moondrakes, and Sinister Concoction.
2016-03-15 17:47:21 -05:00
Simown
9dc71d2996
Added advanced deck generator functions and tidied up the layout.
2016-03-13 11:33:45 +00:00
rkfg
fec2ed464f
Fix default value for "Store images in zip files".
...
It's set to true as the default checkbox state but to false as the
default cached value. Because of that if preferences are never saved
images are stored to directories though the checkbox will be set in
preferences.
2016-03-11 20:41:19 +03:00
rkfg
909a99ceec
Fix transformable cards state desync.
2016-03-09 16:27:00 +03:00
rkfg
8be72c404e
Add debug logging to LinePool.
2016-03-09 14:37:59 +03:00
rkfg
b513f3c7b6
Properly close, free and stop lines.
2016-03-09 14:37:58 +03:00
rkfg
d7cdfa016e
Minor change, add comments.
2016-03-09 14:37:57 +03:00
LevelX2
7ac679048c
Fixed a problem that a chang of the card offset value in preferences was not immediately applied to the card selector in deck editor.
2016-03-09 12:26:35 +01:00
LevelX2
4f8a3e5ae8
Fixed a bug that quitting a tournament by using the "Quit Tournament" button on the tournament panel did not work ( fixes #1601 ).
2016-03-09 12:25:01 +01:00
rkfg
d8ff28c7f7
Refactor audio manager, add line pool.
2016-03-08 02:09:57 +03:00
Quercitron
6e4a4285b8
Fix images download from magiccards.info
2016-03-08 01:21:34 +03:00
rkfg
f95921cc73
Enable hyperlinks handling only in the game log window.
2016-03-07 03:33:04 +03:00
LevelX2
0c242bce5f
* Some more support for GUI resizing.
2016-03-06 02:59:47 +01:00
LevelX2
c6f8d09229
Merge origin/master
2016-03-06 02:06:37 +01:00
LevelX2
e29c4c3516
* Fixed that the storm counter was no shown on the game panel.
2016-03-06 02:06:10 +01:00
rkfg
5fe67bda4c
Remove unneded import.
2016-03-06 02:55:30 +03:00
rkfg
768b004d3e
Fix race condition on tooltip resize in EDT.
...
CardInfoPane.setCard() performs the tooltip resize, initially it's of
zero width and height. The resize happens in the EDT but location is
calculated in the thread pool's thread, i.e. before the first resize.
Because of that the first time the tooltip appears it may be partially
off-screen, nothing fatal but looks ugly. Now all calculations are moved
to EDT as well and they're guaranteed to happen after the resize.
2016-03-06 02:53:32 +03:00
rkfg
98c291be7b
Protect tooltip counter from going negative forever.
2016-03-06 02:53:31 +03:00
LevelX2
dd9431c8ea
* Added scrolling to the game dialog area. Some more GUI resizing. Removed some unwanted borders of viewports.
2016-03-05 21:00:55 +01:00
rkfg
1ff8e42222
Prevent tooltip counter going up on hyperlink click.
2016-03-05 01:03:39 +03:00
rkfg
63ca80fc86
Recreate card thumbnails wrongly encoded as CMYK JPEG from PNG. Fixes
...
#1589 .
2016-03-05 00:06:57 +03:00
rkfg
79568c82f2
Fix that when you quickly move cursor from one hyperlink to another,
...
tooltip disappears.
2016-03-04 21:39:48 +03:00
rkfg
75324f778e
Fix tooltip for cards with apostrophes. If there are cards with quotes
...
or lt/gt in the name, this will need more generic approach.
2016-03-04 21:39:47 +03:00
rkfg
a612eb4585
Fix CRLF mess again.
2016-03-04 10:29:40 +03:00
LevelX2
3f57012c85
Merge origin/master
...
Conflicts:
Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
2016-03-03 23:22:06 +01:00
rkfg
e8091daea5
Reverted crlf's back.
2016-03-04 01:13:27 +03:00
rkfg
b9bbf9ccec
Store symbols as .gif instead of .jpg, rename already downloaded ones on
...
start, fixes #98 .
2016-03-04 01:06:53 +03:00
rkfg
47b2a64cee
Store symbols as .gif instead of .jpg, rename already downloaded ones on
...
start, fixes #98 .
2016-03-04 00:59:12 +03:00
rkfg
9cf972ced4
Faster symbols load.
2016-03-03 23:04:35 +03:00
rkfg
89bce030d0
Add colorless mana filter to deck generator.
2016-03-03 00:39:58 +03:00
rkfg
6cfe43e9b7
Make DeckGeneratorDialog fields non-static for more OOP-style.
2016-03-03 00:39:57 +03:00
rkfg
5b9a38bf22
Fix first card tooltip show.
2016-03-02 14:48:57 +03:00
rkfg
ba0cd24b55
Show card tooltips in system logs.
2016-03-01 01:12:57 +03:00
rkfg
abff5c1958
Filter HTML in ability picker.
2016-02-29 20:53:03 +03:00
rkfg
f7314307a6
Reload symbols after closing the symbols download window (better UX).
2016-02-29 20:08:52 +03:00
rkfg
f00a588e24
Add Generate button to Deck Editor.
2016-02-29 19:40:00 +03:00
rkfg
3658a8c7bc
Prevent NPE if client never connected to any server and doesn't have
...
sets downloaded.
2016-02-29 19:39:59 +03:00
LevelX2
6d4a3bac28
Fixed that wathcing games did not work correctly.
2016-02-28 10:52:55 +01:00
LevelX2
f87c5bbbec
Fixed that the flag on avatar image could be to big.
2016-02-27 12:33:08 +01:00
LevelX2
ad4b68dcb5
Fixed card grid dimension initialisation.
2016-02-27 09:30:21 +01:00
LevelX2
56294eac50
Merge origin/master
2016-02-27 09:28:01 +01:00
LevelX2
ac757b6a88
Fixed card grid dimension initialisation.
2016-02-27 09:27:43 +01:00
LevelX2
d2b7aea306
Merge pull request #1566 from rkfg/master
...
Fix building, fix NPE on sideboarding, fix one of the perl scripts.
2016-02-27 09:26:25 +01:00
LevelX2
aa015b52e6
GUI Size - Fixed that table header lines were not horizontally moved.
2016-02-27 09:15:17 +01:00
rkfg
9842199d6f
Fix NPE after finishing a round.
2016-02-26 21:09:11 +03:00
rkfg
b9dc5036ef
Assembly fix.
2016-02-26 21:05:21 +03:00
Goesta
ad62546807
Improved download speed of foreign language cards
2016-02-25 19:30:20 +01:00
LevelX2
df98b4e0af
* Fixed a bug with time stamp order and change of basic land type (e.g. Blood Moon and Spreading Seas).
2016-02-25 17:08:17 +01:00
Quercitron
61cad91f9b
Fix images download from magiccards.info
2016-02-24 02:17:02 +03:00
LevelX2
3cd9dc3bf6
Merge pull request #1555 from goesta/wizard-multilanguage-card-download
...
Added support for downloading multi-language cards form Wizards.com
2016-02-23 21:51:36 +01:00
Goesta
36e084990a
Added Wizards.com multi-language cards download
2016-02-23 17:27:01 +01:00
tritoch
3b17587b80
Spelling
...
apllication -> application
2016-02-22 15:14:02 -06:00
LevelX2
b9d3e55f94
Fixed Secluded Steppe card number in the "Wade into Battle" commander 2015 deck sample-decks directory.
2016-02-21 23:50:30 +01:00
LevelX2
74b4e5941b
Fixed a spelling error in GUI Size text.
2016-02-21 23:21:21 +01:00
LevelX2
e9638bcc4d
Release 1.4.9v0
2016-02-21 12:58:58 +01:00
LevelX2
51a0d8a4b2
Some more changes to GUI to better support high screen resolutions.
2016-02-21 12:15:11 +01:00
LevelX2
e04c82a227
Some more changes to GUI to better support high screen resolutions.
2016-02-21 11:30:12 +01:00
LevelX2
249d709cc7
Sizable GUI - game dialog area elements resize now.
2016-02-20 02:31:47 +01:00
LevelX2
e15807b9ed
* Some more changes to adjustment possibilities of GUI size.
2016-02-19 16:30:52 +01:00
LevelX2
35505b29bb
Some more changes to GUI to better support high screen resolutions.
2016-02-19 01:56:15 +01:00
LevelX2
77eff0984a
Some more changes to GUI to better support high screen resolutions.
2016-02-18 00:27:48 +01:00
LevelX2
28b129018f
* Some more changes to adjustment possibilities of GUI size.
2016-02-17 18:08:21 +01:00
LevelX2
5ca4e3bc7a
Some more changes to GUI to better support high screen resolutions.
2016-02-16 23:15:34 +01:00
LevelX2
f54c675c4b
* Fixed a bug of colorless mana (e.g. caused Heartbeat of Spring not working with Urza's lands).
2016-02-16 17:15:47 +01:00
LevelX2
129c6ca6ff
Merge origin/master
2016-02-16 11:33:14 +01:00
LevelX2
4f8c4fc019
* Fixed bug that request to show players hadn did not work.
2016-02-16 11:32:23 +01:00
fireshoes
bf3e90b8ee
Added DDQ and SOI cards. Added Duel Deck sample decks. Corrected Mindwrack Demon translation.
2016-02-16 00:36:17 -06:00
LevelX2
f7a7b2e7a0
Some more changes to GUI to better support high screen resolutions.
2016-02-14 23:34:36 +01:00
LevelX2
1835671f3d
Some more changes to GUI to better support high screen resolutions.
2016-02-14 13:41:43 +01:00
LevelX2
7ef0a0a7f0
Some more changes to GUI to better support high screen resolutions.
2016-02-13 02:30:05 +01:00
LevelX2
706d319f81
Some more changes to GUI to better support high screen resolutions.
2016-02-12 13:35:04 +01:00
LevelX2
7b79de8e40
Some more changes to GUI to better support high screen resolutions.
2016-02-10 23:34:16 +01:00
LevelX2
a0ff08b0b9
Some more changes to GUI to better support high screen resolutions.
2016-02-10 08:31:21 +01:00
fireshoes
2a92f5e77a
Added SOI and EMN sets. Added some SOI cards.
2016-02-08 20:53:09 -06:00
LevelX2
a07db4cb8e
Some more changes to support GUI size for high resolutions.
2016-02-09 03:06:32 +01:00
Quercitron
d139cd591c
Fix images download from magiccards.info
2016-02-09 01:39:28 +03:00
LevelX2
77a8e3e7a9
* Some fixes to font size change of chat panels.
2016-02-08 16:16:19 +01:00
LevelX2
ac2570f982
Added a chat font size option to preferences.
2016-02-08 08:49:57 +01:00
LevelX2
687ab7ec6b
Added some tooltips to user table headers. History is shown in tournament player table now. Changed ratio column to numberic format.
2016-02-06 21:22:51 +01:00
LevelX2
81af372bc1
Fixed some problems with possible ConcurrentModificationExceptions and some minor changes.
2016-01-31 23:23:09 +01:00
Me Car
284c36b756
Add allowed quit ratio option to match option and tourney option.
2016-02-01 02:25:44 +09:00
Me Car
574e3cfd36
Split History column into Matches and Tourneys column.
2016-01-30 16:01:04 +09:00
LevelX2
e31b12325e
Added "info [username]" command to get history for offline players. Remove user info column.
2016-01-23 16:59:15 +01:00
LevelX2
151e678e84
Changed history handling for user a bit. Added history to table waiting dialog and user avatar tooltip.
2016-01-23 13:37:34 +01:00
LevelX2
4acadf051d
Minor changes.
2016-01-23 01:27:08 +01:00
LevelX2
5981816a4b
Switch to 1.4.8 for upcoming realease.
2016-01-22 22:33:58 +01:00
LevelX2
93ac094470
Fixed a problem that symbols were not redownloaded if a 0 size file was created because the target file to download was not available before.
2016-01-22 14:28:46 +01:00
LevelX2
b23ddd99a0
* Some adjustments for the colorless mana symbol.
2016-01-21 23:49:24 +01:00
fireshoes
f51be0b3ef
Added OGW tokens to card-pictures-tok.txt
2016-01-20 09:15:03 -06:00
LevelX2
c6eff03339
Merge pull request #1482 from menocar/user-stats
...
Record game histories. Compute user stats and show them in the client.
2016-01-20 07:31:11 +01:00
Me Car
379e61f98a
Adjust the index correctly.
2016-01-20 13:04:04 +09:00
Me Car
550648ccbe
Record game histories. Compute user stats and show them in the user panel.
2016-01-20 12:47:58 +09:00
LevelX2
cdbda6a7e6
* Fixed ArrayIndexOutOfBoundsException by trying to do actions on tables removed meanwhile.
2016-01-15 21:03:39 +01:00
Me Car
ea480a6593
Create MagePreferences class for managing preferences. We should move preference related code from MageFrame and PreferencesDialog to the class. Push all raw string preference key manipulations for serverAddress, serverPort, userName, password and email into the class.
2016-01-15 03:08:52 +09:00
Me Car
b114c17135
Store usrName and password per server. Update input boxes with corresponding values when server is changed in ConnectDialog. Save prefs on successful requests in RegisterUserDialog and ResetPasswordDialog.
2016-01-14 18:00:04 +09:00
Me Car
f5765383c7
Use server and port specified in ConnectDialog rather than in the preference.
2016-01-14 10:01:30 +09:00
Me Car
cb050c3208
Send password on reconnect.
2016-01-14 09:53:23 +09:00
Me Car
199e278ed9
Add input boxes to password reset form for server address and port.
2016-01-14 07:12:03 +09:00
Me Car
8801b63744
Add tooltip messages to clarify the usage of user authentication.
2016-01-12 13:31:27 +09:00
Me Car
746d034461
Implement a password reset flow.
2016-01-11 21:49:02 +09:00
Me Car
f99660a451
Add some password validation.
2016-01-11 11:15:01 +09:00
LevelX2
121f40c019
Prepared 1.4.7.
2016-01-10 22:13:59 +01:00
LevelX2
7f4291ac07
Fixed a problem of image download for OGW.
2016-01-10 22:13:30 +01:00
Me Car
a0ddd4fff0
Send an email on successful user registration. Use Gmail API for that. Add password confirmation and email to RegisterUserDialog.
2016-01-10 18:18:38 +09:00
Me Car
835f08c18f
Add a user registration dialog.
2016-01-09 06:43:10 +09:00
LevelX2
aadc253afa
Merge pull request #1442 from menocar/password
...
Add a password user authentication when connecting to servers.
2016-01-06 23:31:25 +01:00
LevelX2
2526dbd1c7
* Fixed null pointer exception of deck editor.
2016-01-06 22:18:35 +01:00
Me Car
32b4675f13
Integrate Shiro.
2016-01-05 03:48:43 +09:00
Me Car
33330e9345
change the type to password
2016-01-05 02:16:32 +09:00
Me Car
ea5abfe578
Add password input box
2016-01-05 02:16:32 +09:00
LevelX2
7c00e4b16d
* Graveyard window - Fixed that the displayed card order was sometimes mismatched.
2015-12-25 17:43:10 +01:00
fireshoes
3008b5ed14
[OGW] Added 18 cards. Cards with <> in their activation costs are untested.
2015-12-14 23:02:35 -06:00
fireshoes
a0f80b785c
Added 12/13 spoilers for OGW, EXP, and DDQ to mtg-cards-data.txt. Added Duel Decks: Blessed vs. Cursed set. Added reprints from the 12/13 spoilers.
2015-12-14 14:36:12 -06:00
LevelX2
207f486afc
* Xmage 1.4.6v0
2015-12-13 19:47:04 +01:00
LevelX2
ea0ba76736
* Deck editor - Fixed a bug that prevented users to add cards to deck or sideboard (was caused by creatures with negative toughness and it was sorted by p/t - fixes #1414 ).
2015-12-13 10:34:35 +01:00
LevelX2
d9b20298b7
* Bloodlord of Vaasgoth - Fixed that Vampires entering the battlefield did never bloodthirst from the Bloodlord.
2015-12-13 10:05:54 +01:00
LevelX2
81e67927a5
Minor change to download of card images.
2015-12-12 17:39:14 +01:00
LevelX2
af793c30fe
* Added a slider to the preferences to adjust the delay for the card tooltip window appearance.
2015-12-08 18:39:47 +01:00
fireshoes
7a102b2c35
Merge origin/master
2015-12-07 15:14:50 -06:00
fireshoes
f8ba0da7e5
[OGW] Added Mina and Denn, Wildborn. [EXP] Added filterlands. [CUBE] Renamed Holiday Cubes to Vintage Cubes. Add Vintage Cube 2016.
2015-12-07 15:13:31 -06:00
LevelX2
f7b8ab626d
* Added scroll ability for system messages panel.
2015-12-05 00:48:36 +01:00
LevelX2
af23795a7b
* Fixed wrong formated definition error of card-picture-tok.txt.
2015-12-03 16:53:06 +01:00
fireshoes
d0d9731da2
Added promo sets Arena League, Super Series, APAC Lands, Euro Lands, Commander's Arsenal, Champs, and Ugin's Fate. Added some Media Insert, Judge Promo, and FNM promos.Fixed a few collector numbers to match magiccards.info.
2015-12-01 20:19:28 -06:00
LevelX2
044c30b638
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:40 +01:00
LevelX2
3a7983a0d0
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:31 +01:00
Neil Gentleman
bfb428b13a
always use log4j
...
removed all references to mage.util.Logging, java.util.logging
transient static doesn't mean anything, since static fields are never
included in serialization
2015-11-28 21:11:25 -08:00
LevelX2
0a39b0568d
* Fixed that the selected avatar was not shown as avatar in the game ( fixes #1365 ).
2015-11-28 09:38:28 +01:00
fireshoes
ce3a443a65
Updated the card-pictures-tok.txt file with some additional tokens.
2015-11-25 11:22:27 -06:00
LevelX2
8957128b13
* Renamed "Historical Standard" format to "Historical Type 2" and "Super Standard" to "Super Type 2". Added Chronicles to the set lists.
2015-11-25 17:29:23 +01:00
Neil Gentleman
a90d0e5597
reuse shared code for picking basic land sets
2015-11-22 18:00:10 -08:00
LevelX2
05dd1daee6
* Added some information to the player tooltip in game (expericence counters, deck hash code, # of wins).
2015-11-22 11:07:48 +01:00
Neil Gentleman
702be67453
correct some dodgy sample deck names
2015-11-21 22:36:07 -08:00
LevelX2
b84a315780
[C15] Fixed not correct working Commander 2015 decklists.
2015-11-21 22:56:14 +01:00
LevelX2
0d86e8e063
Xmage 1.4.5v0
2015-11-21 10:33:43 +01:00
LevelX2
cd17436c4e
[C15] Added the C15 deck lists.
2015-11-19 17:25:38 +01:00
Neil Gentleman
68e850b8b8
remove old bundled mage-theme-plugin.jar
...
which causes plugin loading to consistently fail, so switch back to
directly instantiating ThemePluginImpl()
this is a little unfortunate, because these plugins don't get the same
lifecycle handling as external ones
re: c25e45095e
2015-11-15 15:28:03 -08:00
LevelX2
576a9ea74f
Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format.
2015-11-15 10:25:02 +01:00
LevelX2
79c04eef47
* Added Momir Basic format to table filtering so Momir Basic games are shown.
2015-11-14 19:07:48 +01:00
Quercitron
a092f965fa
Add tokens.mtg.onl token images source
2015-11-13 02:54:22 +03:00
Neil Gentleman
02a6780766
add Momir Basic game type
...
- re-using Emblems as Vanguard cards; should probably give them their own
CommandObject class
- setting the timing on the Momir ability to TimingRule.SORCERY causes the
ability not to activate (?), so I've left it at INSTANT for now
- need to add a new card image source for vanguard cards
2015-11-11 12:31:30 -08:00
Neil Gentleman
c25e45095e
remove Mage.Theme.Plugin module
...
it has been a included in Mage.Client since 8ac58cfc
2015-11-11 00:31:31 -08:00
Neil Gentleman
deb4608c00
Don't try to play null audio
...
a message is already logged when loadClip fails; this avoids showing an error
dialog over and over afterwards.
2015-11-08 22:32:43 -08:00
Quercitron
e23fc13db0
Fix pictures for some tokens from recent sets
2015-11-08 20:16:47 +03:00
fireshoes
59cf816f32
[C15] Added 11/5 spoilers and Angel of Serenity reprint, corrected Meteor Blast's translated name, and updated tokens.
2015-11-05 10:26:40 -06:00
LevelX2
c71e89c441
Merge pull request #1346 from nigelzor/misc-fixes
...
Misc fixes
2015-10-29 09:19:23 +01:00
Winston Huang
0af814f3d0
Fix MageFrame title
2015-10-28 22:04:25 -07:00
Neil Gentleman
ff1b424caf
options passed to JOptionPane were backwards
...
they're both -1, so this doesn't change anything
2015-10-28 21:48:58 -07:00
fireshoes
bf2992fc42
Added Commander 2015 set; added Eternal Witness and Kalemne, Disciple of Iroas cards to C15.
2015-10-20 14:52:39 -05:00
Neil Gentleman
6c43858046
Deck Editor: Fix redraw after missing image
2015-10-19 00:27:59 -07:00
LevelX2
b3cadac4ea
* Image download - Fixed a bug of mythicspoiler source, that preveneted download of EXP images.
2015-10-04 22:58:09 +02:00
LevelX2
e2453abbb5
* Fixed a bug that some options in preferences were handled with the wrong state as long as never set manually.
2015-09-29 17:26:29 +02:00
LevelX2
b95d7ca705
* Fixed some problems with new avatar handling.
2015-09-27 14:50:44 +02:00
LevelX2
23cd772fea
* Fixed that using a previous internal avatar ID did create an exception while playing/watching a game.
2015-09-27 14:11:56 +02:00
LevelX2
9d3619b68c
* Some rework of preferences avatar panel.
2015-09-26 01:10:05 +02:00
LevelX2
2023686ee8
* Some minor changes.
2015-09-25 23:22:54 +02:00
LevelX2
044e8b70f0
Some minor changes for BFZ token image handling.
2015-09-23 19:53:25 +02:00
LevelX2
5bed5aeff7
* Fixed null pointer exception for download with mythicspoiler.
2015-09-21 19:21:23 +02:00
LevelX2
9ab323a89c
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 08:11:58 +02:00
LevelX2
322eae2ec6
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 00:31:42 +02:00
LevelX2
ed15f0b86b
Fixed that not BFZ images were downloaded from mysticspoliers source. Fixed that Zendikar Expeditions images were not downloaded from mysticspoliers source.
2015-09-20 20:23:36 +02:00
fireshoes
f2b7771d59
[BFZ] Implemented Prism Array, Sanctum of Ugin, Spawning Bed, Makindi Sliderunner , Snapping Gnarlid, Molten Nursery, Pilgrim's Eye
2015-09-17 20:35:14 -05:00
LevelX2
9a37bd28ad
Xmage 1.4.4v0
2015-09-05 12:51:07 +02:00
LevelX2
fe80d292ab
Some changes for token download.
2015-09-05 01:53:48 +02:00
LevelX2
707c1acf6b
* Added an option to auto order triggers with the same text. Added options to pass priority automatically after spell cast and ability activation. Fixed a problem of the tests with the new Scry mulligan.
2015-09-04 00:25:23 +02:00
Simown
1bdc54556a
Fixed a bug in random deck generation where generating a deck from a set
...
with too few cards caused an exception. Minor formatting fixes.
2015-09-03 21:30:15 +01:00
Simown
14148b25db
Fixed a bug in random generation where selecting a set which had no basic lands caused an error. Partially fixes #1242
2015-09-03 19:40:12 +01:00
fireshoes
cb01b0ee05
Implemented [BFZ] Omnath, Locus of Rage, [MRD] Dross Scorpion, and[SCG] Vengeful Dead. Changed some cards from using DiesCreatureTriggedAbility to DiesThisOrAnotherCreatureAbility.
2015-08-30 14:47:21 -05:00
fireshoes
9e1f67fa1a
[BFZ] Implemented Felidar Cub, Incubator Drone, Barrage Tyrant, Mist Intruder, Gideon's Reproach, Kozilek's Channeler, and Eldrazi Scion Token. [ONS] Implemented Airdrop Condor.
2015-08-30 02:52:11 -05:00
LevelX2
e32e7a4638
Added a fix for the serverlist URL setting to automatically switch xmage.info to xmage.de.
2015-08-29 09:42:17 +02:00
LevelX2
dfe1e2ef5a
Some minor changes.
2015-08-28 16:52:33 +02:00
LevelX2
b6c3355329
[BFZ] Added Devoid and Ingest keywords.
2015-08-28 16:51:37 +02:00
LevelX2
423e1fd368
* Triggered abilities order selection is applied immediately now.
2015-08-28 15:16:24 +02:00
LevelX2
39e62095e4
Fixed some dialogs for human players that were not shown after a reconnect to a game (e.g choose mulligan, any use Yes/No choice, amount choice, Pile choice).
2015-08-28 14:29:54 +02:00
LevelX2
758f56792e
* Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328 ).
2015-08-28 11:44:14 +02:00
LevelX2
b63cc121ef
Some minor changes.
2015-08-27 14:51:21 +02:00
LevelX2
97a8b351b4
Fixed a problem that show cards window was not closed (e.g. for libraray card selection).
2015-08-26 16:30:32 +02:00
LevelX2
0ee22d90ca
Allow hand card ordering by drag'n'drop only with left mouse button.
2015-08-26 16:29:57 +02:00
LevelX2
532d4e0af0
* Added automatic handling for order of triggered abilities going to stack ( fixes #701 / related to #328 ).
2015-08-22 19:29:57 +02:00
LevelX2
23039572f2
Xmage 1.4.3v3
2015-08-21 09:49:53 +02:00
LevelX2
386204c085
* Draft log - Fixed a bug that the last pick was logged twice.
2015-08-19 11:46:57 +02:00
LevelX2
e2625fd60e
* Show card pick dialog - Fixed a bug that the select window was hidden if you clicked and released the mouse button on the edges of the window.
2015-08-18 12:29:57 +02:00
fireshoes
1d86561dd3
Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type.
2015-08-17 14:20:01 -05:00
LevelX2
917d576de2
Merge pull request #1192 from gerschulle/draft-log
...
Add option to log draft picks into a file for review after the game
2015-08-13 11:21:56 +01:00
jonhwoods
3addd1dd2a
Sounds Update
...
Made the sounds shorter, quieter and less agressive using normalization,
fade in and fade outs
2015-08-12 12:52:41 -04:00
Gerhardt Schulle
54c1e4f66c
Add option to log draft picks into a file for post review after the game.
2015-08-09 21:35:49 +02:00
LevelX2
c98577cc6a
Xmage 1.4.3v0
2015-08-06 22:18:01 +02:00
LevelX2
e7ecdefce2
Added example decks.
2015-08-06 16:22:52 +02:00
LevelX2
7a90db7995
* Fixed sluggishness of player selection. Reworked flag display in avatar image.
2015-08-06 00:31:50 +02:00
LevelX2
cbbc70d26b
* Made table filter more accurate and moved Historical and Super Standard format to Other filter.
2015-08-05 00:07:53 +02:00
LevelX2
8dca887fad
* Added tooltip to the flag in the player avatar.
2015-08-02 12:41:29 +02:00
LevelX2
768fd17d93
* Some spelling changes.
2015-07-26 09:19:46 +02:00
fireshoes
5897f1595a
Implemented Glissa Sunseeker, Phyrexian Furnace, Flickering Ward, Cho-Manno's Blessing, Meng Huo Barbarian King, Sword of the Chosen, Pentarch Ward, Order of the Stars, Ancestral Mask, Jedit Ojanen of Efrava, Krosan Restorer, & Nature's Kiss. Added set Battle for Zendikar and spoiled Evolving Wilds.
2015-07-24 00:21:32 -05:00
Simown
a6bab84c85
Generated deck name/path is now a timestamp.
...
Changed deck generator to use a timestamp of the current time to the millisecond as the generated deck name.
This gets rid of the random UUID filling up the deck path and generated deck name.
2015-07-19 13:39:38 +01:00
Simown
cedf16806e
Fix to #1128 Deck generation throws IndexOutOfBoundsException.
...
Reserve cards now counted correctly.
Fixed reserve card adding algorithm to stop trying to add cards out of range.
2015-07-19 12:12:10 +01:00
LevelX2
635c33fa87
Merge pull request #1117 from brodee/master
...
random draft bug fix and random draft ui improvements
2015-07-15 08:30:22 +02:00
brodee
c7a349f65f
random draft bug fix:
...
packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early.
Random draft ui improvements:
only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced.
the pack selector ui will prevent you from chosing fewer than 2 packs.
2015-07-14 22:34:58 -07:00
LevelX2
6cf0a59644
* Fixed possible null pointer exception in client.
2015-07-12 09:19:43 +02:00
LevelX2
c9cc7d7920
* Zurgo Helmsmasher - Fixed a bug that could happen if Zurgo is used as commander.
2015-07-12 09:03:04 +02:00
LevelX2
b38885b7bf
* Fixed a bug that prevented that the width of connection column in user list was restored.
2015-07-09 09:59:20 +02:00
Simown
6a5eb8ff83
Small fixes to constants, added header and standardised spelling
2015-07-09 01:58:45 +01:00
LevelX2
b80e27f3b3
* Fixed handling of Phyrexian mana.
2015-07-09 01:43:26 +02:00
Simown
a1fd4e91f0
Overhaul and fix of random deck generation.
2015-07-08 23:13:21 +01:00
LevelX2
d847fb7109
Some minor changes.
2015-07-08 22:51:31 +02:00
Nidhoegger
9be613beb9
Fixed Issue #1054 . Buttons in Feedback panel will only get focused, if the MageFrame has the focus thus preventing focus theft from other programs.
2015-07-06 10:51:06 +02:00
LevelX2
d33f85d04a
Fixed wrong name for download of Kothophed, Soul Hoarder image.
2015-07-04 19:26:48 +02:00
LevelX2
cd0cba6ec7
XMage Release 1.4.2v0
2015-07-04 01:28:19 +02:00
LevelX2
1c157a20ae
* Fixed a bug caused by now possible column order setting in tournament panel.
2015-07-03 22:44:08 +02:00
LevelX2
0f5f8493c7
Improved fix for #584 by Nidhoegger.
2015-07-03 12:34:13 +02:00
LevelX2
589b63c5b1
Fix for the "Modal Window bug under Linux (e.g. X value announcement) by Nidhoegger.
2015-07-02 20:48:32 +02:00
LevelX2
3eb1fd4047
Added a button to attack with all available cratures.
2015-07-02 17:03:14 +02:00
LevelX2
0cbe590cac
* Fixed that mana auto-payment settings were not correctly set from previous settings on game start.
2015-07-02 13:18:12 +02:00
LevelX2
0a0cb40783
* Fixed that creatures that have to pay costs to block were wrongly forced to block causing UI locks.
2015-07-01 23:00:22 +02:00
LoneFox
ca0793a5c1
Fix systematic misspelling of "hover"
2015-06-30 21:28:32 +03:00
LevelX2
df3e6db569
Please test! Some changes to the display of user choices, showing also a longer text in tooltip window.
2015-06-28 21:55:48 +02:00
LevelX2
d24777cd15
Merge pull request #1062 from brodee/master
...
random booster draft UI improvement
2015-06-28 18:37:27 +02:00
brodee
cd1352eb01
Switch to a separate window to chose the packs for random booster drafts.
2015-06-27 23:16:59 -07:00
LevelX2
87f3978589
Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information.
2015-06-28 00:10:38 +02:00
LevelX2
81934e32e3
* Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state.
2015-06-25 01:07:34 +02:00
LoneFox
e139e4524f
Don't use a proprietary class. Fixes build on OpenJDK.
2015-06-24 19:31:15 +03:00
LevelX2
72408a7f52
Added card frame downloader.
2015-06-24 13:41:14 +02:00
LevelX2
ca9e52f99b
Merge pull request #1052 from brodee/master
...
code review comments for chaos/random booster draft:
2015-06-24 06:56:45 +02:00
brodee
38235d9023
Update NewTournamentDialog.java
...
removing commented code
2015-06-23 21:08:39 -07:00
brodee
4113976b7e
code review comments for chaos/random booster draft:
...
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
2015-06-23 21:04:59 -07:00
Brodee
ac0aa65aab
code review comments for chaos/random booster draft:
...
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
2015-06-23 20:59:05 -07:00
fireshoes
35d47229ea
Merge origin/master
2015-06-23 20:39:07 -05:00
fireshoes
0568f16788
Added 3 Premium Deck Series sets and all From the Vault sets, and added all existing cards for them.
2015-06-23 20:37:26 -05:00
LevelX2
0a3c081ded
Merge pull request #1048 from brodee/master
...
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
LevelX2
2547753dcb
Added Sen Triplets (Alara Reborn = 100%).
2015-06-23 16:15:14 +02:00
LevelX2
5b02b5b32c
Exile, Reveal, Looked At windows of a game are hidden now as you switch to another pane (e.g. other game, tables, deck editor) and shown again as you switch back.
2015-06-23 16:14:11 +02:00
LevelX2
6b2bfc5e19
Merge origin/master
2015-06-23 08:36:28 +02:00
