Oleg Agafonov
8df4ba3871
UI: added images re-download mode and improved dialog UX;
2018-12-19 05:19:29 +04:00
Oleg Agafonov
110f8a20ab
UI improved for mage dialogs:
...
* added working popup hints for buttons and cards while user in choose mode;
* fixed wrong windows position after tray icon clicks or mouse moves;
* added big combobox's popups support (now users can select/choose items from outer space);
2018-12-18 18:06:32 +04:00
Oleg Agafonov
617f4d4b4b
UI: added new download images dialog:
...
* new option to download all modern cards;
* new option with language selection;
* new button for sets fast search;
* new language support: Chinese Traditional;
* all sets are sorted by date and have released date;
* fixed selection reset on source changes;
2018-12-18 18:01:35 +04:00
Oleg Agafonov
79370108eb
Refactor: extract make window centered code;
2018-12-18 17:57:46 +04:00
Oleg Agafonov
c799fa94ec
Refactor: removed closed images source magiccards.info (it was migrated to scryfall);
2018-12-18 17:52:28 +04:00
Oleg Agafonov
70012af6db
Refactor: improved language support in card images sources;
2018-12-18 17:50:19 +04:00
Oleg Agafonov
4495d75d8a
Fixed NPE error on AI calcs
2018-12-18 17:17:10 +04:00
Oleg Agafonov
3960ad7444
UI: fixed error and improved stability on lobby's table selection/click;
2018-12-15 22:25:09 +04:00
Oleg Agafonov
0a2f312da7
Added build time to version info, cleanup manifest files;
2018-12-15 18:29:10 +04:00
SpikesCafe-google
a852d5c9e5
Add Spiny Starfish from Alliances.
2018-12-09 13:48:55 -05:00
LevelX2
e6ce58d6bf
XMage 1.4.32V0
2018-11-26 19:30:22 +01:00
LevelX2
e7d129a074
Merge branch 'master' into add-minimum-rating-option
2018-11-26 17:18:35 +01:00
Oleg Agafonov
f15d8a0da8
Code cleanup;
2018-11-19 15:39:05 +04:00
Oleg Agafonov
d78d818a66
* Fixed not working deck generation for some settings ( #5413 );
2018-11-19 01:03:05 +04:00
Oleg Agafonov
5ffb6e1fd7
* Changed default US server from vaporservermtg.com to mtg.powersofwar.com
2018-11-18 04:15:47 +04:00
Oleg Agafonov
30c373c40b
Removed bloated log on non text clipboard data
2018-11-17 11:43:24 +04:00
Oleg Agafonov
6fa014d1a9
Merge pull request #5420 from hitch17/load-deck-content-from-clipboard
...
Prepopulate DeckImportFromClipboardDialog content with string content…
2018-11-17 11:36:43 +04:00
John Hitchings
b1df464e8f
refactor deck import content to include hints
2018-11-16 21:57:25 -08:00
Oleg Agafonov
92d1b5c51a
* UI: added new skill level column with star icons instead text;
2018-11-17 02:48:50 +04:00
Oleg Agafonov
0b089895a7
Fixed scryfall images download for PUMA set;
2018-11-12 04:14:53 +04:00
Oleg Agafonov
b298a621fb
Added scryfall download for new set: GNT, UMA, PUMA
2018-11-12 01:39:31 +04:00
John Hitchings
baeb9d8b00
Prepopulate DeckImportFromClipboardDialog content with string contents of clipboard.
2018-11-08 09:25:03 -08:00
Oleg Agafonov
706ed23bdc
* Added ignored list to tournaments (users from ignored list can't join to your tournaments too);
2018-11-05 09:28:24 +04:00
Oleg Agafonov
a806e79abd
* Improved chat help about ignore command (it's not only chat, but game joins too);
2018-11-05 09:06:31 +04:00
John Hitchings
c9719488ca
Fix GAME_CHOOSE_ABILITY event submitted to appendJsonEvent.
2018-11-04 11:19:16 -08:00
LevelX2
e6b78d7a2e
Updated some libs to newer versions.
2018-10-21 21:36:53 +02:00
Oleg Agafonov
2bd5d0ddf6
* UI: Fixed wrong game selection by double click on tables list ( #5239 );
2018-10-13 01:11:26 +04:00
Oleg Agafonov
9a4fb4adb1
Tests: fixed error on missing db files;
2018-10-12 22:19:45 +04:00
LevelX2
2367ff5940
Fixed a problem that caused netbeans design view to fail.
2018-10-10 16:10:54 +02:00
LevelX2
189984d3d6
DeckEditorPanel - Fixed some existing exceptions.
2018-10-10 15:37:26 +02:00
Oleg Agafonov
1c95ed3b08
* Added new set Arena New Player Experience (ANA) with 39 cards (18 new);
2018-10-09 20:54:46 +04:00
Oleg Agafonov
10f56fb2a1
[ANA] - added White Spirit token
2018-10-09 19:37:56 +04:00
Oleg Agafonov
0181bf4f41
[ANA] - added goblin token
2018-10-09 18:17:15 +04:00
Oleg Agafonov
72d23bfe95
* UI: deck editor - added cards sorting by rarity ( #4414 );
2018-10-03 23:59:51 +04:00
Oleg Agafonov
64721675f2
Merge remote-tracking branch 'remote-production/master' into local-production
2018-10-03 22:10:23 +04:00
Evan Kranzler
1f239b28b3
added GRN guild kit set
2018-10-03 13:01:40 -04:00
Oleg Agafonov
69546c82ce
* Added missing images for WPN and Gateway Promos (GRC) set in scryfall source;
2018-10-03 20:32:58 +04:00
Oleg Agafonov
fccae9b8cd
* Added new set Anthologies (ATH) with 85 cards;
2018-10-03 01:52:16 +04:00
Aaron Miller
5cd57199c7
Merge branch 'master' into add-minimum-rating-option
2018-09-29 19:15:46 -07:00
Aaron Miller
81c2a62250
Add "minimum rating" option to matches and tournaments
2018-09-29 19:14:39 -07:00
Oleg Agafonov
8df97aa6f6
* Added missing images for 2 sets in scryfall source:
...
* Grand Prix Promos (GPX);
* European Land Program (EURO).
2018-09-27 16:28:09 +04:00
Oleg Agafonov
82168ded34
Images: added direct images download for scryfall source (promos support);
2018-09-27 14:12:37 +04:00
Oleg Agafonov
1ff849bac2
Fixed DPA rarity
2018-09-27 13:12:51 +04:00
Oleg Agafonov
85c391394c
* Added new set "Duels of the Planeswalkers" (113 cards);
2018-09-27 12:24:18 +04:00
Ingmar Goudt
a0e54fbb7b
remove redundant null checks, remove some static fields
2018-09-26 22:02:03 +02:00
Ingmar Goudt
f04d7c9b03
remove redundant null checks before instanceof
2018-09-17 21:09:42 +02:00
LevelX2
7bc160c7ca
Added some allowed sets to download sources.
2018-09-14 10:29:12 +02:00
Oleg Agafonov
38a45c2e8e
Refactor: removed outdated code for non implemented cards
2018-09-09 16:06:40 +04:00
Michael Simons
b78bfabe86
Update image sources for available recent sets
2018-08-25 23:56:45 -04:00
Michael Simons
28f3e52b57
Update Set Symbols for recent sets and client errors on download
2018-08-25 23:13:18 -04:00
Oleg Agafonov
3f16a83fd3
* Cleanup logs from load svg/gif errors (show total errors instead each symbol)
2018-08-26 01:15:11 +04:00
Oleg Agafonov
09f5af154e
Fixed too large temp files creation for svg icons on startup
2018-08-20 17:52:30 +04:00
L_J
f9c52b4859
Adaptive Enchantment fix ( fixes #5232 )
2018-08-16 22:47:30 +00:00
LevelX2
deb675a74a
Xmage 1.4.30V0
2018-08-15 11:35:40 +02:00
LevelX2
21b67af7f5
Merge pull request #5213 from rkfg/master
...
Perform the action on double click in the game list.
2018-08-15 08:20:00 +02:00
LevelX2
a30ed4fee5
Merge pull request #5157 from ninthworld/master
...
Add Star Wars Expansion sets to the Star Wars set
2018-08-15 08:09:19 +02:00
rkfg
18dbd06450
Perform the action on double click in the game list.
2018-08-11 23:55:19 +03:00
spjspj
824637d33e
Merge pull request #5207 from spjspj/master
...
Update Penny Dreadful
2018-08-08 00:10:45 +10:00
spjspj
589a542cbc
Update Penny Dreadful
2018-08-08 00:09:03 +10:00
LevelX2
7f4573f8ce
Added some sets to the download sources.
2018-08-07 00:14:22 +02:00
spjspj
4ce9addcc0
4 decks for C18
2018-08-04 01:14:57 +10:00
ninthworld
2a2df685a9
Merge branch 'master' of https://github.com/magefree/mage.git
2018-08-01 18:40:58 -07:00
spjspj
f58e33524d
Implement 1 card C18
2018-07-27 18:53:34 +10:00
Chris Swenson
0484f4f453
undo CardImageUtils change
2018-07-20 23:54:47 -07:00
ninthworld
d7c1b8b9c9
fix card bugs for Star Wars set
2018-07-17 13:01:19 -07:00
ninthworld
88c049f44a
add Star Wars Expansion Set images
2018-07-16 22:22:44 -07:00
ninthworld
86107de54e
Merge remote-tracking branch 'upstream/master'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-07-16 21:16:20 -07:00
igoudt
cd0c0b3bdd
fix planeswalker check in EDH powerlevel comparator
2018-07-15 20:42:14 +02:00
LevelX2
98793e4511
Added download from M19 CM2 from Wizard source.
2018-07-14 18:26:48 +02:00
Oleg Agafonov
69465fd9b6
* Fixed svg symbols download from scryfall ( #5135 );
2018-07-10 05:49:21 +04:00
spjspj
1f39a3df51
..
2018-07-09 01:35:57 +10:00
spjspj
5744bfa843
Add in new bar chart distribution for the 'M' mana analyse button.
2018-07-09 01:15:07 +10:00
spjspj
6b9a2bb12c
Add in new bar chart distribution for the 'M' mana analyse button.
2018-07-08 21:28:25 +10:00
spjspj
e0bffcc521
Add in new bar chart distribution for the 'M' mana analyse button.
2018-07-08 13:09:38 +10:00
spjspj
9ececbbda8
Add in new bar chart distribution for the 'M' mana analyse button.
2018-07-08 12:59:59 +10:00
spjspj
35022d4ed3
Add in new bar chart distribution for the 'M' mana analyse button.
2018-07-08 12:53:30 +10:00
spjspj
56526d5413
Copy Paste image source
2018-06-24 21:13:35 +10:00
Oleg Agafonov
90b2a287e1
UI: added info about image download sources and modes;
2018-06-23 19:03:14 +04:00
Oleg Agafonov
6c20ee4a74
* Images: added localized card images download from scryfall source;
2018-06-23 16:27:34 +04:00
LevelX2
443558406c
Enabled M19 Scryfall image download.
2018-06-21 23:06:38 +02:00
Michael Simons
dbb3120199
Update ScryfallImageSource.java
...
Remove CM2 until full list available on Scryfall
2018-06-10 22:32:13 -04:00
Michael Simons
845bb0d90e
Merge branch 'master' into add_CM2
2018-06-10 01:42:24 -04:00
LevelX2
52270a11c8
Merge origin/master
...
Conflicts:
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
2018-06-10 01:13:30 +02:00
LevelX2
2627cb2914
Changed us server url for fast connect button.
2018-06-10 01:12:05 +02:00
Evan Kranzler
56777cb0d0
Updated the default US server link
2018-06-09 14:20:43 -04:00
Michael Simons
663a6d3471
Add DDU set to Image download sources.
2018-06-07 23:24:06 -04:00
Michael Simons
4d5018bef0
Fixed typos/misspellings based on IntelliJ's suggestions.
2018-06-07 22:39:53 -04:00
GrayedFox
3953f3dbdd
remove all MIT copyright notices from files
2018-06-02 17:59:49 +02:00
GrayedFox
1aee67db5d
remove dated license txt from release folder
2018-06-02 17:48:28 +02:00
spjspj
bb5d601ff4
New plane (Panopticon) with 'PW to' ability checked
2018-05-31 23:14:56 +10:00
Evan Kranzler
6636fb3b3a
fixed an annoying error that didn't affect anything
2018-05-28 18:52:19 -04:00
GrayedFox
e84907c252
remove unecessary column restructuring and renaming
...
rename "constructed rating" column to just "rating"
remove setting setAutoCreateColumnsFromModel to false since changing the
default behaviour is no longer required
2018-05-28 12:50:07 +02:00
LevelX2
a19c257e50
XMage 1.4.30V0
2018-05-27 01:28:42 +02:00
LevelX2
66cc29325c
* Some fixes to some Battleebond cards.
2018-05-27 00:41:53 +02:00
LevelX2
d743864bbd
* Try to fix URL handling.
2018-05-27 00:41:30 +02:00
LevelX2
fcc6174e5e
Some null exceptions checking and fixed some other minor problems.
2018-05-26 01:22:28 +02:00
LevelX2
af2d55f8aa
Deck editor - Fixed a bug that the card list could not be sorted by color text.
2018-05-26 01:20:55 +02:00
LevelX2
4a0427a54e
Merge pull request #4965 from GrayedFox/issue-4952-fix-touranment-lobby-prefs
...
Issue 4952 fix touranment lobby column width and order
2018-05-24 23:32:26 +02:00
GrayedFox
f3cdad97e7
add default width for History (also fixes stored width not being used)
2018-05-23 19:06:01 +02:00
GrayedFox
9da01a1270
remove logging
2018-05-23 18:50:12 +02:00
GrayedFox
49fd99a45b
fix columns being resized due to auto creation flag
2018-05-23 18:00:25 +02:00
GrayedFox
42b539c41f
renamed utility functions for clarity
2018-05-23 16:49:48 +02:00
GrayedFox
32cb438e7c
minor refactor - code ordering and variable reference
2018-05-22 21:26:17 +02:00
GrayedFox
ebc36c503e
add restoring tournament table chat divider location
...
refactor getting current bounds into utility function
2018-05-22 20:36:05 +02:00
GrayedFox
5822a7d94d
refactor divider setting and saving into utility functions
...
refactor setting and saving filters into utility functions
2018-05-22 20:11:07 +02:00
LevelX2
f89c3cc65b
Merge pull request #4953 from GrayedFox/issue-4952-fix-touranment-lobby-prefs
...
Issue 4952 fix touranment lobby prefs (WIP)
2018-05-22 16:56:43 +02:00
LevelX2
edc7daf126
Merge pull request #4916 from Faxn/enhancement/startArgs
...
Enhancement/Autoconnect by Argument
2018-05-22 06:57:38 +02:00
GrayedFox
f1f2a80f4f
add logging for restoring/saving column width and order (remove later)
2018-05-20 21:24:59 +02:00
GrayedFox
0fe129f817
remove todo (column wodth and sort order persists through restarts)
2018-05-20 20:12:22 +02:00
GrayedFox
a3e433f7bd
remove offending line setting width incorrectly (was always 1647)
2018-05-20 19:25:31 +02:00
GrayedFox
06392f510c
refactor code
...
reorder import statemets
tableSeats renamed to jTableSeats to follow naming scheme
setGUISize called sooner (as it is in PlayersChatPanel.java)
2018-05-20 18:33:06 +02:00
Evan Kranzler
30922924f5
added TheElk801 as a dev
2018-05-15 20:22:05 -04:00
Michael Simons
f39a6e9411
Set Commander Anthology Vol II added
2018-05-12 19:11:05 -04:00
Blake Curry
5e6474c06e
Improved command line autoconnect
...
Changed how the command line autoconnect was handled to leverage the existing autoconnect code.
2018-05-10 14:05:34 -04:00
campb
6ad23a2f3d
Parsing connect arguments and connecting.
2018-05-10 14:05:34 -04:00
Michael Simons
15c72f6d8d
Token image changes for DOM
2018-05-10 00:25:49 -04:00
Michael Simons
969bf282cd
Merge dom_tokens
2018-05-09 23:33:10 -04:00
Michael Simons
e654635211
Token changes for C17
2018-05-09 22:13:30 -04:00
LevelX2
bf8acb6d8c
Merge pull request #4923 from magefree/rystan-patch-2
...
Added Chandra Bold Pyromancer planeswalker deck from Dominaria
2018-05-09 12:39:27 +02:00
Michael Simons
e6d56999e8
Added Chandra Bold Pyromancer planeswalker deck from Dominaria
2018-05-09 02:17:23 -04:00
Michael Simons
fe1bc0fa1a
Added remaining 2011 Commander pre-constructed decks
2018-05-09 02:15:05 -04:00
LevelX2
dcd3e7c039
* Some more fixed/reworked card movement handling.
2018-05-08 23:46:34 +02:00
Oleg Agafonov
c44127e238
Removed gray background file from random folder ( #3152 )
2018-05-07 21:53:56 +04:00
LevelX2
feb17320c5
Some minor changes.
2018-05-06 09:44:14 +02:00
Oleg Agafonov
e9d5afd530
Refactoring: replace custom creature tokens with basic class
2018-05-06 00:50:02 +04:00
LevelX2
cddd81123b
Some changes related to #4893 .
2018-05-03 01:33:21 +02:00
Oleg Agafonov
b6bad9ca96
* Fixed viewer's error on tokens show up (Mirage and other); Fixed some tokens.
2018-05-02 15:16:39 +04:00
spjspj
4b4d7989cd
Merge pull request #4879 from spjspj/master
...
Add planechase to new tournament window as well.
2018-05-02 18:31:59 +10:00
Oleg Agafonov
4d31294ee9
Refactor images path code
2018-05-02 00:16:41 +04:00
LevelX2
bdb0254274
Added 3 AI suitable decks.
2018-04-30 17:21:36 +02:00
spjspj
1dbffe70b5
Add planechase to tournaments
2018-04-29 23:47:08 +10:00
Oleg Agafonov
f682bfb527
* [Start Wars] Fixed all tokens (viewer, image download);
2018-04-29 01:20:40 +04:00
Oleg Agafonov
bb3c7232ea
* [Start Wars] Fixed Obi-Wan Kenobi emblem (viewer, image download);
2018-04-28 22:43:28 +04:00
Oleg Agafonov
7cb90e2475
* Fixed same images download bug for basic lands in Star Wars set.
2018-04-28 22:23:10 +04:00
Oleg Agafonov
c24ba742f6
Fixed equal or == errors -- 23 cards and more (see #4407 )
2018-04-28 21:24:48 +04:00
LevelX2
b3d62865d9
* Fixed a problem of deck generator to use cards from sets not legal to the format ( fixes #4642 ).
2018-04-28 01:13:58 +02:00
spjspj
96f8fb0cb7
Merge pull request #4877 from spjspj/master
...
Fix mana dialog box.
2018-04-27 23:55:40 +10:00
spjspj
843ecddfde
Fix mana dialog box.
2018-04-27 23:35:56 +10:00
spjspj
66825b37df
Merge pull request #4865 from spjspj/master
...
Implement Brawl Free For All and Brawl Duel
2018-04-25 19:44:41 +10:00
spjspj
730d23164a
Implement Brawl Free For All and Brawl Duel
2018-04-25 19:17:34 +10:00
LevelX2
e54980f6ae
Merge pull request #4850 from salco/feature/new_ui_selection_type
...
Feature/Add Set Selection filtering
2018-04-24 22:39:22 +02:00
spjspj
f1b79bb902
Merge pull request #4857 from spjspj/master
...
pennydreadful update
2018-04-24 23:05:19 +10:00
spjspj
5746a40ad2
pennydreadful update
2018-04-24 23:03:32 +10:00
spjspj
229cad7330
Merge pull request #4853 from spjspj/master
...
One more plane
2018-04-24 14:12:48 +10:00
spjspj
5e70e73acd
One more plane
2018-04-24 09:21:32 +10:00
Salco
f680f336ae
add file for checkboxlist
2018-04-23 11:24:07 -04:00
Salco
eb0f196a7e
merge file from master
2018-04-23 11:04:17 -04:00
Salco
6e6d26eabb
fix issu with multiple selection being added every time updated
2018-04-23 10:04:54 -04:00
Salco
435ce4dba7
add new function to spawn with combobox or checkboxlist
2018-04-23 10:03:56 -04:00
Salco
d782b69f0f
rename my PickChoiceDialog to PickCheckBoxDialog and bring back the correct one
2018-04-23 09:58:28 -04:00
Oleg Agafonov
23becf1775
Texts update: to target creature or player => to any target
2018-04-22 08:15:40 +04:00
Evan Kranzler
7deb521a65
more mana pool errata
2018-04-21 18:36:22 -04:00
LevelX2
92793327f3
* returned UUID of used THOUGHT AS effect instead of boolean.
2018-04-21 22:32:45 +02:00
LevelX2
357d126596
Revert "Feature/Add Set Selection filtering"
2018-04-21 17:29:16 +02:00
LevelX2
054cf4763a
Merge pull request #4708 from salco/feature/new_ui_selection_type
...
Feature/Add Set Selection filtering
2018-04-21 17:12:09 +02:00
Salco
e53a9d5f39
move feature to the filter already implemented.
2018-04-20 08:27:22 -04:00
LevelX2
fe2220e19e
Xmage 1.4.29V0
2018-04-19 21:07:14 +02:00
LevelX2
fc0068665f
[DOM] Freed Dom download for Wizard source.
2018-04-19 19:59:47 +02:00
Evan Kranzler
50b5377a8e
fixed mana pool errata
2018-04-15 14:30:01 -04:00
spjspj
a828050ae1
Continuing implementation of Planechase.
2018-04-14 23:09:37 +10:00
spjspj
611b48fd47
Continuing implementation of Planechase.
2018-04-14 10:47:49 +10:00
spjspj
d97a3ebf04
Continuing implementation of Planechase.
2018-04-13 01:20:10 +10:00
spjspj
3e092c2211
Continuing implementation of Planechase.
2018-04-12 21:03:53 +10:00
spjspj
87d19c7d51
Continuing implementation of Planechase.
2018-04-12 11:51:28 +10:00
spjspj
c8b741f0bf
Continuing implementation of Planechase.
2018-04-12 00:07:24 +10:00
LevelX2
fdcd833791
Activated DOM image downloading.
2018-04-11 00:18:01 +02:00
spjspj
e932c139d9
Beginning of implementation of Planechase.
...
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls. Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
2018-04-09 08:44:48 +10:00
LevelX2
ecbe7e68a6
* Fixed that second or higher level of attachments was not shown correctly on battlefield ( fixes #892 fixes #4539 fixes #785 fixes #258 ).
2018-04-08 20:38:26 +02:00
Thomas Contis
6e7570d066
Fully fixed issue 4514. Use showCardsOrTokens()
2018-04-06 19:39:36 -04:00
Oleg Agafonov
dc1eaeb5bb
Fixed viewer size update, code clean, fixed typo
2018-04-06 11:49:08 +04:00
Thomas Contis
95cbb3007e
Removed db and log files
2018-04-05 20:35:03 -04:00
Thomas Contis
f9cc468595
Fixed issue #4514
2018-04-05 15:51:52 -04:00
Oleg Agafonov
39119de43e
Merge pull request #4706 from AdamJAKing/issue-4692-card-hint-window
...
Card hint window now disappears for all cards
2018-04-03 18:53:34 +04:00
Salco
e7b9d30f39
clean code and comment
2018-04-03 10:02:08 -04:00
Salco
8753cfeb67
clean code and comment a function in FastSearchUtil_1
2018-04-03 09:43:37 -04:00
Salco
cd3e58dbab
new button to filter TAG
2018-04-03 09:36:01 -04:00
AdamJAKing
26c9c80d68
Card hint window now disappears for all cards
2018-04-02 21:49:18 +01:00
spjspj
d5374554c0
Merge pull request #4702 from rystan/master
...
Update Feline Ferocity deck to include missing card
2018-04-02 13:35:27 +10:00
Michael Simons
97d0f32889
Update Feline Ferocity to include missing card
...
Added missing "Stalking Leonin" that was implemented after deck was built.
2018-04-01 22:27:33 -04:00
LevelX2
337025b614
Merge pull request #4699 from spjspj/master
...
Add an on-hover highlight effect.
2018-04-01 23:48:26 +02:00
Oleg Agafonov
c98dcbd55a
Merge pull request #4700 from rystan/master
...
2 additional Planeswalker decks
2018-04-01 19:52:59 +04:00
Michael Simons
ef44c57a32
2 additional Planeswalker decks
2018-04-01 11:08:39 -04:00
spjspj
7698856d29
Add an on-hover highlight effect.
2018-04-02 01:01:32 +10:00
spjspj
e2fbe8cee9
Merge pull request #4697 from spjspj/master
...
Add an on-hover over avatar highlight effect.
2018-04-01 21:49:43 +10:00
spjspj
2ff3d2ca87
Add an on-hover highlight effect.
2018-04-01 21:40:16 +10:00
LevelX2
93b821375c
Merge origin/master
2018-04-01 12:34:30 +02:00
LevelX2
20f03cfcb1
Some minor changes to Momir code.
2018-04-01 12:33:59 +02:00
Michael Simons
936bab3303
Add missing mountain to Commander 2016 Entropic Uprising deck
...
Fixes issue #4694
2018-04-01 00:43:45 -04:00
spjspj
b69f2c4fd8
Add 'Choose Matching' to deck editor
2018-03-31 17:55:55 +11:00
Oleg Agafonov
8563c6d865
Merge pull request #4682 from delftswa2018/hotfix/resolving-unaccepted-changes
...
Hotfix - resolving unaccepted changes
2018-03-29 17:25:04 +04:00
Oleg Agafonov
d7237c4afa
Merge pull request #4681 from delftswa2018/feature/ClickableMsgOfTheDay
...
Clickable message of the day
2018-03-29 17:24:50 +04:00
Oleg Agafonov
0939aefe51
Merge pull request #4680 from delftswa2018/feature/loadingtime
...
Improved XMage startup time
2018-03-29 17:23:38 +04:00
Marc Zwart
a7ffaafcb0
made close call safe
2018-03-29 13:53:59 +02:00
Danny Plenge
aa96caa554
Removed useless else case
2018-03-29 12:54:43 +02:00
spjspj
938ac35981
Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain.
2018-03-29 00:28:56 +11:00
Danny Plenge
98c2b171de
Added the URLHandler which makes the URL's in the message of the day clickable.
...
At the moment when there are 2 URL's in 1 message, it only makes the last one clickable.
2018-03-28 13:49:04 +02:00
Christiaan
f956075341
Merge remote-tracking branch 'origin/master' into feature/loadingtime
2018-03-27 17:28:58 +02:00
Christiaan
e69423af27
performance improvements for startup
...
added option to skip generating small icons that already exist, load symbol images multithreaded
2018-03-27 17:26:19 +02:00
spjspj
08ffbecdb4
Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain.
2018-03-28 02:22:28 +11:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master
...
Karn, Scion of Urza (DOM)
2018-03-25 09:04:49 +11:00
spjspj
4527f791aa
Karn, Scion of Urza (DOM)
2018-03-25 01:44:23 +11:00
igoudt
00f91391e9
Homarid Drake, reprints, and rewriting his or her to their
2018-03-22 16:52:26 +01:00
ArcadeMode
5ac975c52e
Blocker and Critical level bugfixes throughout the project ( #4648 )
...
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP
* ensure closing of scanner if it was opened
* Refactored method in EmpyrialArchAngel to not always return same value.
* Refactored method in FalkenrathAristocrat to not always return same value.
* Refactored method in GilderBairn to not always return the same value.
* fixed left open resources, ensured quiet closing of the streams
* Refactored method in IceCave to not always return same value.
* Refactored method in KjeldoranRoyalGuard to not always return same value.
* Refactored method in LegionsInitiative to not always return same value.
* Refactored method in NaturesWill to not always return same value.
* added quiet closing method in new streamutils class, used to clean up the connectdialog
* Fix small typo
* added quiet closing to saveobjectutil
* closed resources in savegame method of gamecontroller
* properly close resources in loadGame method of GameReplay class
* further proper resource closing in ServerMessagesUtil
* fixed unclosed resources in copy method in mage framework Copier
* closed unclosed resources in copyCompressed method in Copier
* ensure closing of filewriter in manasymbols
* ensure proper closing of Stream in arcane UI
* ensure closing of datagram socket in arcane Util
* ensure resource closing in deckimport from clipboard
* ensure closing of plugin classloader
* ensured closing of zipinputstream resource
* ensure closing of fileoutputstream in ScryfallSymbolsSource
* ensure closing resources after finishing/canceling download of pictures
* remove commented code
* move locks to try block to ensure unlocking along all execution paths
* remove dangerous instance of double-checked locking
* removed dangerous instance of double checked locking in settingsmanager
* Removed dangerous instance of double-checked locking in ThemePluginImpl
* close resource which did not happen certainly
* close another stream
* ensure closing of inputstream
2018-03-22 08:13:13 -05:00
Marc Zwart
c2c395420e
close resource which did not happen certainly
2018-03-22 10:30:10 +01:00
Danny Plenge
90631eff60
Removed dangerous instance of double-checked locking in ThemePluginImpl
2018-03-20 16:10:09 +01:00
Marc Zwart
3e1312064f
removed dangerous instance of double checked locking in settingsmanager
2018-03-20 16:04:10 +01:00
Marc Zwart
6debe066f1
remove dangerous instance of double-checked locking
2018-03-20 16:01:48 +01:00
Marc Zwart
d299ee0882
remove commented code
2018-03-20 15:37:46 +01:00
Marc Zwart
f883d6b0a8
ensure closing resources after finishing/canceling download of pictures
2018-03-20 15:37:25 +01:00
Marc Zwart
1e18875725
ensure closing of fileoutputstream in ScryfallSymbolsSource
2018-03-20 15:27:14 +01:00
Marc Zwart
1ec5a3fb4d
ensure resource closing in deckimport from clipboard
2018-03-20 15:00:08 +01:00
Marc Zwart
338e9833cc
ensure closing of datagram socket in arcane Util
2018-03-20 14:59:41 +01:00
Marc Zwart
63dbfb8a9b
ensure proper closing of Stream in arcane UI
2018-03-20 14:48:22 +01:00
Marc Zwart
a0a2ac1b5a
ensure closing of filewriter in manasymbols
2018-03-20 14:40:58 +01:00
Marc Zwart
4bc5a9bd61
Merge branches 'hotfix/close-unclosed-resources-mage-client', 'hotfix/close-streams-in-updater', 'hotfix/fix-non-closed-scanner' and 'hotfix/manapiechart-potential-zero-division' into feature/SonarqubeFixes
2018-03-20 13:03:28 +01:00
Marc Zwart
7233f5d86f
added quiet closing to saveobjectutil
2018-03-20 12:55:37 +01:00
Marc Zwart
9912a23007
added quiet closing method in new streamutils class, used to clean up the connectdialog
2018-03-20 12:46:53 +01:00
spjspj
8ff4f81cea
Merge pull request #4640 from spjspj/master
...
New M15 Rendering for Unstable lands
2018-03-20 16:49:00 +11:00
spjspj
a368c93845
New M15 Rendering for Unstable lands
2018-03-20 16:12:43 +11:00
Oleg Agafonov
1635766262
* Added localized card images download for Russian, Korean and Portuguese from wizards.com;
2018-03-19 22:01:54 +04:00
Oleg Agafonov
4774c0290e
* Deck editor: unique filter disabled by default now ( #4612 );
2018-03-19 18:06:11 +04:00
spjspj
da7bca48df
Merge pull request #4638 from spjspj/master
...
Fix for mana symbols indexoutofbounds exception
2018-03-19 21:18:20 +11:00
spjspj
de6eb6ece1
Fix for mana symbols indexoutofbounds exception
2018-03-19 21:16:32 +11:00
LevelX2
b073ce1c42
* Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. ( #4634 ).
2018-03-18 18:18:54 +01:00
LevelX2
af296cbe79
* Added display of live on player avatar image,
2018-03-17 00:47:09 +01:00
LevelX2
9c0d0a0153
* Saved table spectator setting to preferences.
2018-03-17 00:46:12 +01:00
spjspj
cd21387659
Merge pull request #4624 from spjspj/master
...
Add rendering for Expeditions
2018-03-16 22:57:37 +11:00
spjspj
89d58bef5b
Add rendering for Expeditions
...
(With non-copyright background image)
2018-03-16 22:49:21 +11:00
LevelX2
753e039d02
* Fixed a problem that a tooltip window was shown of cards from panels in the back.
2018-03-16 00:28:12 +01:00
LevelX2
64f9dc6e60
* Add Land Dialog - Added deck size value and images of mana symbols.
2018-03-15 23:37:05 +01:00
Marc Zwart
51b266a2de
fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP
2018-03-15 10:47:31 +01:00
Oleg Agafonov
1b8049780b
clean
2018-03-15 00:27:09 +04:00
Oleg Agafonov
83a3de9a93
* UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog);
2018-03-15 00:14:04 +04:00
Oleg Agafonov
4a77ab1714
* UI: added hotkeys to pick number dialog (choose value by <ENTER> key);
2018-03-14 18:46:28 +04:00
LevelX2
25f5be3aba
* Fixed a problem with download of Unhinged card images with a card name.
2018-03-13 22:56:39 +01:00
LevelX2
bd56b074a0
* Some minor changes to game end window.
2018-03-13 18:01:26 +01:00
spjspj
a4485e92eb
Merge pull request #4611 from spjspj/master
...
Add an 'add only full art land' option to the add land dialog.
2018-03-13 01:04:16 +10:00
spjspj
7e919b9f39
Add an 'add only full art land' option to the add land dialog.
...
Should give an error message when someone says only full art lands, but then chooses a set that has no full art lands.
2018-03-13 00:38:43 +11:00
LevelX2
fe5743b29e
Fixed a bug that the mana symbols for monocolored hybrid mana were not shown.
2018-03-11 13:03:58 +01:00
LevelX2
2fb8926432
* Deck editor - Saved the search checkbox options to reset for next deck editor start.
2018-03-11 11:47:33 +01:00
LevelX2
fed2d1a259
XMage 1.4.28V0
2018-03-10 20:42:29 +01:00
LevelX2
b60522f9e4
Added option to activate/deactivate JSON game log. Added logic to write the logs to subdirectory. Some changes to SEND_PLAYER_ACTION type logging.
2018-03-10 00:04:56 +01:00
LevelX2
51c68842aa
Some minor changes to JSON game log ( #4587 ).
2018-03-08 23:40:55 +01:00
LevelX2
82e8606b40
* Added Master 25 to Wizard download source.
2018-03-08 23:26:55 +01:00
LevelX2
fedf254219
Merge pull request #4554 from hooptie45/topic/json-logs
...
[WIP] Consumable JSON game logs
2018-03-08 17:32:32 +01:00
spjspj
79d4e7e9b1
Add a 'spectators allowed' option for regular tables (aka non tournaments).
2018-03-08 23:45:09 +11:00
spjspj
4c7b0d50d2
Add a 'spectators allowed' option for regular tables (aka non tournaments).
2018-03-08 23:31:51 +11:00
spjspj
be70ecd7f3
Add a singleton search option for deck editor search
2018-03-04 17:57:51 +11:00
spjspj
da76c7687d
Missing deovid type background
2018-03-04 02:17:21 +11:00
spjspj
8cf065e345
For actual cards on modo, the full background is always printed to it (not just part of the top left corner of the background).
2018-03-03 23:51:47 +11:00
Oleg Agafonov
08f15416ba
* Add new full set Masters 25 (only Karona's Zealot must be implemented);
2018-03-02 22:06:24 +04:00
spjspj
550b98509c
Merge pull request #4562 from spjspj/master
...
Fix zendikar full art land drawings. (Travis build failed but didn't seem to be related to Mage.Client)
2018-03-02 17:33:11 +10:00
spjspj
60cc0525da
Fix zendikar full art land drawings.
...
- Realized curve fits part of an off-centered ellipse
(a 295x700 sized ellipse, with the top left being 197 pixels off the top of the top of the curved image on a scanned ZEN forest with bounding rects of: 293x337)
2018-03-02 18:22:09 +11:00
spjspj
d6910897e3
Merge pull request #4559 from spjspj/master
...
Zen lands slightly offcenter
2018-02-28 23:50:10 +10:00
spjspj
8c614a9006
slightly offcenter
2018-03-01 00:49:43 +11:00
spjspj
8887cca387
slightly offcenter
2018-03-01 00:32:30 +11:00
spjspj
6516e7eea4
Merge pull request #4556 from spjspj/master
...
Adding in way to render BFZ style full art lands (BFZ and HOU full ar…
2018-02-28 00:54:04 +10:00
spjspj
596ca5be86
Adding in way to render BFZ style full art lands (BFZ and HOU full art lands)
...
Things still to do:
1) Get everyone to download the full art Face images ...
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
2018-02-28 01:25:29 +11:00
spjspj
154c2121b1
Merge pull request #4555 from spjspj/master
...
Modifying zendikar curved box to use a path instead. (Will be easier …
2018-02-28 00:35:02 +11:00
spjspj
a28e273dcc
Modifying zendikar curved box to use a path instead. (Will be easier to then draw BFZ lands similarly).
2018-02-28 00:02:14 +11:00
Shaun Hannah
7c7f88ab3c
[WIP] S3 Upload of JSON log
2018-02-27 05:17:20 -05:00
Shaun Hannah
6aeb3c7c3a
[WIP] Consumable JSON game logs
...
As discussed in https://github.com/magefree/mage/issues/4515
This exposes a JSON log of game interactions that can be analyzed.
This is just a first pass, to get up to speed with how the messaging works. It'd like to trim down the messages much
further so they don't include redundant information in each message. Also gson supports much more advances serialization
options; such as using the @Expose annotation. We should probably use that, but I ran into some issues (I'm not a java
developer, so still learning).
TODO:
These currently only exist on the client side; ideally we'd submit this logs back up to a central server after the
games completion; thinking this could be simple via an S3 file drop, and a Lambda function to process and expose the
logs; maybe via a kafka stream.
Examples of log messages are below:
```
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
"type": "GAME_SELECT",
"value": {
"gameView": {
"priorityTime": 3000,
"players": [
{
"name": "computer",
"life": 20,
"counters": {}
},
{
"name": "hooptie",
"life": 20,
"counters": {}
}
],
"hand": {
"425d774f-ee0c-4a9b-8516-c98f886943f0": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
},
"dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
"name": "Blade of the Bloodchief",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
},
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
"name": "Ornithopter",
"power": "0",
"toughness": "2",
"loyalty": "",
"manaCost": [
"{0}"
],
"convertedManaCost": 0,
"type": 0,
"paid": false,
"id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
},
"a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
},
"91239f4f-9003-4c48-8ca1-4c318f892489": {
"name": "Cranial Plating",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "91239f4f-9003-4c48-8ca1-4c318f892489"
},
"feb268d8-0535-4a9c-8915-83dd92a08c4c": {
"name": "Arcbound Ravager",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
}
},
"canPlayInHand": [
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
],
"stack": {},
"combat": [],
"phase": "PRECOMBAT_MAIN",
"step": "PRECOMBAT_MAIN"
},
"message": "Play spells and abilities.",
"options": {
"queryType": "SELECT"
}
}
}
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
"type": "SEND_PLAYER_UUID",
"value": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
}
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
"type": "GAME_CHOOSE_PILE",
"value": {
"choices": {
"1ecf8671-be4c-4060-a76b-af614235a5b7": "Cast Ornithopter"
}
}
}
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-3v2cj2-je43178o-1-je43179f-4",
"type": "GAME_INIT",
"value": {
"priorityTime": 3000,
"players": [
{
"name": "computer",
"life": 20,
"counters": {}
},
{
"name": "hooptie",
"life": 20,
"counters": {}
}
],
"hand": {
"425d774f-ee0c-4a9b-8516-c98f886943f0": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
},
"dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
"name": "Blade of the Bloodchief",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
},
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
"name": "Ornithopter",
"power": "0",
"toughness": "2",
"loyalty": "",
"manaCost": [
"{0}"
],
"convertedManaCost": 0,
"type": 0,
"paid": false,
"id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
},
"a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
},
"91239f4f-9003-4c48-8ca1-4c318f892489": {
"name": "Cranial Plating",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "91239f4f-9003-4c48-8ca1-4c318f892489"
},
"feb268d8-0535-4a9c-8915-83dd92a08c4c": {
"name": "Arcbound Ravager",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
}
},
"canPlayInHand": [
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
],
"stack": {},
"combat": [],
"phase": "PRECOMBAT_MAIN",
"step": "PRECOMBAT_MAIN"
}
}
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-3v2cj2-je43178o-1-je43179f-4",
"type": "GAME_SELECT",
"value": {
"gameView": {
"priorityTime": 3000,
"players": [
{
"name": "computer",
"life": 20,
"counters": {}
},
{
"name": "hooptie",
"life": 20,
"counters": {}
}
],
"hand": {
"425d774f-ee0c-4a9b-8516-c98f886943f0": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
},
"dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
"name": "Blade of the Bloodchief",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
},
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
"name": "Ornithopter",
"power": "0",
"toughness": "2",
"loyalty": "",
"manaCost": [
"{0}"
],
"convertedManaCost": 0,
"type": 0,
"paid": false,
"id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
},
"a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
"name": "Springleaf Drum",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{1}"
],
"convertedManaCost": 1,
"type": 0,
"paid": false,
"id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
},
"91239f4f-9003-4c48-8ca1-4c318f892489": {
"name": "Cranial Plating",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "91239f4f-9003-4c48-8ca1-4c318f892489"
},
"feb268d8-0535-4a9c-8915-83dd92a08c4c": {
"name": "Arcbound Ravager",
"power": "0",
"toughness": "0",
"loyalty": "",
"manaCost": [
"{2}"
],
"convertedManaCost": 2,
"type": 0,
"paid": false,
"id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
}
},
"canPlayInHand": [
"06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
],
"stack": {},
"combat": [],
"phase": "PRECOMBAT_MAIN",
"step": "PRECOMBAT_MAIN"
},
"message": "Play spells and abilities.",
"options": {
"queryType": "SELECT"
}
}
}
{
"gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
"sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
"type": "SEND_PLAYER_UUID",
"value": "1ecf8671-be4c-4060-a76b-af614235a5b7"
}
```
2018-02-26 19:23:00 -05:00
spjspj
871b035bb4
Merge pull request #4551 from spjspj/master
...
Adding in way to render Zendikar full art lands.
2018-02-26 15:31:10 +11:00
spjspj
afeb1c16ac
Adding in way to render Zendikar full art lands.
...
Things still to do:
1) Get everyone to download the full art Face images
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
3) Add in the ability to draw say BFZ / HOU full art lands as well.
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
2018-02-26 15:22:59 +11:00
spjspj
576c1aec57
Adding in way to render Zendikar full art lands.
...
Things still to do:
1) Get everyone to download the full art Face images
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
3) Add in the ability to draw say BFZ / HOU full art lands as well.
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
2018-02-26 12:47:18 +11:00
Oleg Agafonov
8238139192
* UI: added SVG icons support on x64 linux systems (see #4421 , must cleanup xmage\mage-client\lib folder);
2018-02-24 19:52:25 +04:00
Oleg Agafonov
e5ef545d8f
* UI: fixed wrong feedback panel color for non active turn;
2018-02-23 18:21:08 +04:00
LevelX2
1ef84278c2
Merge pull request #4419 from rsypen/master
...
Fixed local server time in client's chat messages
2018-02-15 15:16:52 +01:00
L_J
3dbd5a72c4
Merge branch 'master' into Zzooouhh-banding-final
2018-02-15 00:49:08 +01:00
L_J
3f1499ef76
Adjusted banding arrow position
2018-02-14 23:44:31 +00:00
LevelX2
9fb71b98c4
Xmage 1.4.27V4
2018-02-14 23:05:59 +01:00
L_J
cb63931d35
Adjusted banding arrow position
2018-02-14 15:26:03 +00:00
LevelX2
3b19304f64
* Fixed that soulbond arrow to paired card was not shown and improved soulbond text on permanent.
2018-02-14 12:41:44 +01:00
L_J
e7301e2c08
Implemented banding ( #41 )
2018-02-13 20:36:25 +01:00
LevelX2
6d848e2059
* Fixed a bug that turn rollback did not work correctly, if player was in a buy cost process that included possible rollback ( fixes #4510 ).
2018-02-12 11:41:01 +01:00
LevelX2
fc8604e449
Added proxy handling to tokens.mtg.onl image download.
2018-02-12 11:39:18 +01:00
LevelX2
c9603d1994
* Some fixes to token image downloading.
2018-02-11 23:30:15 +01:00
LevelX2
ac9b03d277
* Changed the connect/disconnect button to include the text directly in the menu button.
2018-02-09 23:27:35 +01:00
Oleg Agafonov
5c44bef2ea
Fixed "all attack" button position
2018-02-05 10:45:07 +04:00
Oleg Agafonov
ae7620918e
Fixed wrong hint for rarity button in deck editor
2018-02-04 23:05:38 +04:00
LevelX2
cafd251e74
* Fixed client filter not showing MTGO 1v1 Commander tables.
2018-02-04 18:34:54 +01:00
Oleg Agafonov
ff6ec8222a
UI: added settings to setup battlefield panel colorizing (default is multicolor; preferences -> main -> battlefield; see #1201 )
2018-02-04 21:06:06 +04:00
Oleg Agafonov
ec5c8a01df
UI: added different colors for current turn phase (same as buttons -- see #1201 )
2018-02-04 12:48:50 +04:00
Oleg Agafonov
5947326a4f
UI: added green colorized panel on player's priority (see #1201 )
2018-02-04 12:09:21 +04:00
Oleg Agafonov
5fa20278b0
UI: improved ask dialog (same size for all buttons)
2018-02-04 09:53:40 +04:00
LevelX2
82defb2ab8
* Removed land set restriction on limited add land dialog ( fixes #4373 ).
2018-02-03 18:35:47 +01:00
Oleg Agafonov
66eb1de7f1
Fixed v1 server incompatible with v0 clients (freezes on game startup)
2018-01-28 17:57:55 +04:00
Oleg Agafonov
2870c3ab2a
Cleanup
2018-01-27 12:54:16 +04:00
spjspj
71a1097b1c
Update connection dialog to point to Xmage.us from xmage.woogerworks.com
2018-01-27 11:28:46 +11:00
spjspj
0c63fc04b4
Update connection dialog to point to Xmage.us from xmage.woogerworks.com
2018-01-27 01:52:31 +11:00
Oleg Agafonov
321a45140b
UI: added more info on card's tooltip delay/disable
2018-01-25 08:15:12 +04:00
spjspj
8db20dbe8d
Merge pull request #4430 from spjspj/master
...
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
2018-01-19 22:20:03 +11:00
spjspj
b26cd21f02
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
2018-01-19 20:33:17 +11:00
spjspj
af48b17451
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
2018-01-19 20:30:12 +11:00
Oleg Agafonov
89f5967441
* [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too);
2018-01-18 07:02:02 +04:00
rsypen
ccd121277a
Fixed local server time in client's chat messages
2018-01-15 09:17:35 +01:00
Oleg Agafonov
b0a8967a3b
Fixed non working SVG symbols on machines without JDK (see #4410 )
2018-01-14 06:54:23 +04:00
LevelX2
40afa04b24
xmage 1.4.27V0
2018-01-13 22:54:53 +01:00
LevelX2
2e3ba7e104
Added designation names to player tooltip.
2018-01-13 18:55:07 +01:00
LevelX2
b10182ab29
Activated RIX download from WOTC source.
2018-01-13 10:24:12 +01:00
Oleg Agafonov
8e3b610a0c
Tests: fixed performance problem (x20 speed up, no need to call full garbage collector manually)
2018-01-09 19:27:25 +04:00
Oleg Agafonov
c07e3d327c
Fixed wrong images download for two side cards (clean cards*.db and images needed)
2018-01-07 22:29:37 +04:00
LevelX2
690c04f5fc
[RIX] Added 3 cards.
2018-01-07 15:05:20 +01:00
Oleg Agafonov
1280565928
Fixed images downloading from scryfall (two sided cards)
2018-01-07 04:41:07 +04:00
Oleg Agafonov
f80aae5161
Updated tests
2018-01-05 02:21:56 +04:00
Oleg Agafonov
0c38fffdef
Fixed not working PickAmount window (not visible)
2018-01-04 07:53:38 +04:00
LevelX2
2672bd36d5
[Rix] Added Jouney to Eternity and Jadelight Ranger.
2018-01-03 11:40:44 +01:00
Oleg Agafonov
050a70b7db
UI: fixed #4329 - errors on card selection in linux (debian)
2018-01-02 19:38:08 +04:00
Oleg Agafonov
9009d72c82
UI: increased tooltip time before hide (60 secs)
2018-01-02 00:15:44 +04:00
Oleg Agafonov
c1bf846973
UI: added new memory statistics, warnings and hints (see #4324 )
2018-01-02 00:14:29 +04:00
Oleg Agafonov
1ad8529df8
Fixed chrismas time fail on new year :-(
2018-01-01 20:51:56 +04:00
Oleg Agafonov
56d214f0b2
UI: added set search button in new tournament dialog
2018-01-01 18:02:20 +04:00
Oleg Agafonov
78d036b6bb
UI: fixed windows layer problems when old window overlapped new window (see #4318 , #4320 and other)
2018-01-01 18:00:42 +04:00
Jonathan Skeate
32cdd3b1ea
Add rarity filters to deck editor
2017-12-31 12:03:31 -05:00
Oleg Agafonov
54e7c3cc99
Added new UI icons for rarity buttons (20 and 32 sizes)
2017-12-31 17:41:00 +04:00
Oleg Agafonov
b697346cb6
Fixed fast search compatibly with non string data models
2017-12-31 00:26:54 +04:00
Oleg Agafonov
d0250f1cc1
UI: added set search button in add land windows (deck editor)
2017-12-30 23:15:36 +04:00
Oleg Agafonov
f9ef1388da
Fixed #4305 - too big card numbers in viewer for some sets
2017-12-30 23:06:19 +04:00
LevelX2
529a38a96f
Fixed some card download problems.
2017-12-30 18:36:03 +01:00
LevelX2
88b06137be
Fixed handling of cards that exist multiple times for Unstable.
2017-12-30 18:35:47 +01:00
Oleg Agafonov
6b52f2efc3
UI: added set search button in viewer
2017-12-30 17:04:58 +04:00
Oleg Agafonov
a32b4b75af
UI: added set search button in deck generator (but it bugged and disabled);
2017-12-30 16:03:49 +04:00
Oleg Agafonov
bb6482d7c2
Fixed typos
2017-12-30 07:26:37 +04:00
LevelX2
5d5c724565
Fixed land download from Gatherer source.
2017-12-29 11:33:56 +01:00
LevelX2
9325a5d311
Added Duel Decks: Merfolk vs. Goblins set.
2017-12-29 11:30:47 +01:00
Oleg Agafonov
35ba9dc493
About updated: added L_J and JayDi85 to devs list
2017-12-29 07:56:54 +04:00
Oleg Agafonov
1239592c2e
UI: added fast set/expansion search button in deck editor
2017-12-29 06:13:01 +04:00
Oleg Agafonov
af0c77a409
UI: added custom sorting in choice dialog
2017-12-29 06:11:10 +04:00
Oleg Agafonov
72aef2638c
UI: added close choice window with ESC button (if not required)
2017-12-29 04:03:31 +04:00
Oleg Agafonov
17bed090f0
UI: fixed inner country combobox data types;
2017-12-29 03:44:08 +04:00
Oleg Agafonov
800c0d20fc
UI: added search flag button to connection dialog;
2017-12-28 22:39:10 +04:00
Oleg Agafonov
e4dfa5925b
UI: added start selection value on choice dialog popup;
2017-12-28 22:38:18 +04:00
Oleg Agafonov
9d1f6ed48e
Updated connection dialog (icons, hints and size fixes)
2017-12-28 03:53:10 +04:00
Oleg Agafonov
4654be5a7d
Fixed card's round corner render (more like real card);
2017-12-28 03:45:32 +04:00
Oleg Agafonov
531b5bc569
Added auto enabled search for all pickup dialogs with many items;
2017-12-25 12:47:30 +04:00
Oleg Agafonov
749ca59ad6
Added new choose dialog (creature types and etc):
...
* added incremental search;
* added keyboard hotkeys (up/down for select, enter for choose);
* added choose by mouse double click;
* added source card name;
* fixed cancel button on required choice (#4230 );
* fixed text sizes form messages (now it's auto size);
2017-12-25 08:12:02 +04:00
Oleg Agafonov
42d3d558ff
little fix
2017-12-23 19:48:00 +04:00
Oleg Agafonov
a80030e8aa
Added new christmas logo (auto-enabled from december 15 to january 15)
2017-12-23 19:38:18 +04:00
Oleg Agafonov
39ca5a13f4
Added new set: Explorers of Ixalan (47 cards, 1 token)
2017-12-22 09:18:41 +04:00
Oleg Agafonov
a24c61079b
Added new set Pro Tour Promos
2017-12-20 20:14:04 +04:00
Oleg Agafonov
c64da6abd9
World Magic Cup Qualifier: removed wrong cards, fixed card numbers, fixed download from scryfall
2017-12-20 19:51:19 +04:00
Zzooouhh
7d86fe2d76
Fixed Nemesis image downloads from MythicSpoiler ( fixes #4260 )
2017-12-16 19:32:34 +01:00
spjspj
2a810e898f
Merge pull request #4251 from spjspj/master
...
Add UST cards
2017-12-16 09:22:38 +10:00
Oleg Agafonov
7a42ea416b
Fixed #4252 (errors on paths with $ symbol)
2017-12-16 03:19:32 +04:00
spjspj
f4cc88bf2a
Storm Crow
2017-12-15 22:04:42 +11:00
Oleg Agafonov
f39e4fd4ee
- added card download for unstable set from scryfall;
...
- changed client version from 9 to 10b;
2017-12-10 17:43:37 +04:00
Oleg Agafonov
5fc0393bc7
Deck editor:
...
+ added warning messages dialog after load/import decks with errors (instead throw exception);
+ added loading cursors on import-load decks;
- fixed null exception error on empty/error deck loading;
2017-12-08 00:20:18 +04:00
Oleg Agafonov
1efc062f66
Decks importer:
...
+ added support for new decklist text format from deckstats.net (see #4228 );
+ added new checks to text format (too many empty lines, too big card number: more then 100);
+ fixed double window popup on cancel/close import from clipboard window;
2017-12-07 23:14:22 +04:00
Oleg Agafonov
5b7ab0de7a
typo
2017-12-07 08:41:59 +04:00
Oleg Agafonov
66a70dd116
- Fixed #4220 - card viewer raise error with alternative card numbers;
...
- Fixed potential error on getCardsByRarity;
- Added inner checks for wrong booster max card numbers settings;
2017-12-07 08:01:54 +04:00
spjspj
35aa92ac72
Fix face images.
2017-12-06 00:03:12 +11:00
Oleg Agafonov
89fae4f33e
Add svg symbols download from scryfall
2017-12-03 20:33:32 +04:00
LevelX2
b3a3e17aa2
[RIX] Activated Mythicspoiler as RIX image download source
2017-12-03 09:45:02 +01:00
Oleg Agafonov
77d31b37f0
Fix wrong images path in zips (compatible with old versions).
2017-11-30 01:56:41 +04:00
Oleg Agafonov
e3a1051499
UI changed:
...
+ added default sorting for completed table (last ended on the top);
+ added "duration" column for completed table;
- fix sorting for start, end and duration columns on completed table;
+ added new password and rated text for columns (more convenient for search);
2017-11-28 01:44:05 +04:00
Oleg Agafonov
f706f9351d
UI changed:
...
+ added default sorting for tables on open (last created on the top);
+ added "time ago" format for created date column;
2017-11-27 21:19:53 +04:00
Oleg Agafonov
6b4000bfe2
- small render fix
2017-11-27 09:27:40 +04:00
Oleg Agafonov
ab7d386689
- fixes
2017-11-27 08:35:21 +04:00
Oleg Agafonov
c29bac08d8
Refactor and fixed and images downloading and paths loading:
...
- Added new images and symbols downloading;
- Fixed user defined images path (now work for all images: cards, symbols, temp downloading);
- Fixed not working cancel button at download window (it close window, but tasks is working, download and didn't save);
- Fixed temp files trash all around images folder (on cancel button);
- Fixed not saving new downloaded cards on cancel button (zip file didn't close on cancel);
2017-11-27 08:09:52 +04:00
Oleg Agafonov
efee0b5328
Merge branch 'master' into svg-mana-icons-support
2017-11-26 18:44:48 +04:00
Oleg Agafonov
37dc9bf73c
Added svg support: generate HQ png files for HTML texts
2017-11-26 18:37:29 +04:00
Oleg Agafonov
a5df082720
Added svg support: render empty mana symbols (by text)
2017-11-26 16:54:05 +04:00
Oleg Agafonov
7a1def128b
Added svg support: new render for mana icons in tables (deck editor, draft)
2017-11-26 16:51:57 +04:00
Oleg Agafonov
f400cd5231
Refactor resource paths and constants:
...
- delete duplicate consts;
- correct paths and it uses;
- fix loading icons from user defined dir;
2017-11-26 16:50:42 +04:00
Oleg Agafonov
5cda60270c
Added svg support: new render for mana icons in tables (deck editor, draft)
2017-11-26 00:50:25 +04:00
Oleg Agafonov
471f49c9c8
Added svg support: new lib, new icons for cards
2017-11-26 00:48:28 +04:00
spjspj
830874bc50
Fix exception
2017-11-26 01:15:24 +11:00
spjspj
00eb481004
spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list)
2017-11-25 22:14:20 +11:00
spjspj
8ab422f55c
Merge pull request #4191 from JayDi85/viewer-more-info
...
Add more card's info to viewer (mage book)
2017-11-24 21:02:47 +10:00
spjspj
763b8d30fd
Add highlights to rendered card title and card type round boxes
2017-11-24 21:59:11 +11:00
spjspj
37fc07a256
Add highlights to rendered card title and card type round boxes
2017-11-23 23:44:51 +11:00
Oleg Agafonov
ca90f2dc45
Add more card's info to viewer (mage book) - full set name, card numbers and total stats
2017-11-23 06:30:49 +04:00
spjspj
184847b23d
Merge pull request #4182 from spjspj/master
...
Slightly better rendering.
2017-11-20 00:38:50 +11:00
spjspj
ea650dcab1
Slightly better rendering.
2017-11-20 00:36:54 +11:00
Oleg Agafonov
b78dab27a1
Little fix to always show icons and names for cards without images.
2017-11-18 16:44:34 +04:00
Oleg Agafonov
e2e4646863
Merge remote-tracking branch 'remotes/origin/master' into new-card-render
2017-11-18 15:04:02 +04:00
Oleg Agafonov
0a0475bd38
Battlefield text position fix
2017-11-18 06:40:01 +04:00
Oleg Agafonov
0689bfca40
comment type
2017-11-18 05:49:31 +04:00
Oleg Agafonov
a19e879021
"Can attack" draw fix
2017-11-18 05:40:24 +04:00
Oleg Agafonov
f81489c377
Add fallback card render (origin card render), see #4168
2017-11-18 05:13:38 +04:00
spjspj
7292683604
Merge pull request #4171 from spjspj/master
...
spjspj - Add in a new way to allow just the Face Art for cards to be shown
2017-11-18 10:30:44 +11:00
spjspj
4247954318
spjspj - Add in a new way to allow just the Face Art for cards into the viewer.
2017-11-18 01:37:10 +11:00
Oleg Agafonov
b53d57bce9
Fix error on download some symbols
2017-11-16 02:08:25 +04:00
Oleg Agafonov
feb53492e6
Add new checks for symbol download settings
...
Fix error on download some symbols
2017-11-16 02:08:25 +04:00
Oleg Agafonov
45aad8b6bc
add new checks for symbol download
2017-11-15 02:57:05 +04:00
Oleg Agafonov
080b4fc1a2
Add new logs and checks in symbols download (for easy setup and fix settings)
2017-11-15 01:44:10 +04:00
Oleg Agafonov
12b420d68b
Add new logs and checks in symbols download (for easy setup and fix settings)
2017-11-15 00:09:31 +04:00
Oleg Agafonov
b97edec5b9
Fix error on download backside.jpg symbol
2017-11-12 07:34:45 +04:00
Oleg Agafonov
9b95e20d83
Fix error on download images of Ixalan set from Wizards site
2017-11-12 06:16:29 +04:00
Oleg Agafonov
badaed63cb
fix #4148 error on downloading double faces cards from scryfall
2017-11-12 02:06:24 +04:00
Oleg Agafonov
62aed011a3
fix issue #4148 on download image cards with quotation mark in names
2017-11-10 02:25:32 +04:00
LevelX2
8cf6a97616
* Fixed a problem with index out of bound for card renderer.
2017-11-04 18:20:17 +01:00
igoudt
9cbc2b7ea2
change client messages to enum rather than string
2017-10-03 15:18:31 +02:00
igoudt
6bde35f275
fixes #4079
2017-10-02 18:38:09 +02:00
spjspj
042e64aeb8
Add a 'your game can start' sound
2017-10-01 01:51:05 +10:00
spjspj
ed429b0c37
Add option to preferences to display full path to image of cards missing images.
2017-09-27 16:04:13 +10:00
spjspj
026e7d3e5d
Add option to preferences to display full path to image of cards missing images.
2017-09-27 09:44:31 +10:00
LevelX2
0b3c24949f
Added Ixalan set to the supported sets for image download by wizard source.
2017-09-22 10:00:29 +02:00
spjspj
b8b0170662
Add Tokens to card-pictures-tok for viewer.
2017-09-18 00:38:02 +10:00
LevelX2
3622206cf1
* Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com.
2017-09-17 11:34:50 +02:00
LevelX2
ae0d87b7ec
* Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com.
2017-09-17 11:33:16 +02:00
LevelX2
9ae4e7d4ef
Added logic to add manual links to MythicSpoilers image source.
2017-09-16 10:33:08 +02:00
LevelX2
b6212a943a
Some minor changes.
2017-09-16 02:01:25 +02:00
LevelX2
75874df33f
Fixed a problem of image download.
2017-09-16 00:11:19 +02:00
LevelX2
2117bfc17c
Merge ReworkImageDownload
2017-09-15 23:23:49 +02:00
LevelX2
ac352537bf
Merge origin/ReworkImageDownload into ReworkImageDownload
...
Conflicts:
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
2017-09-15 23:21:43 +02:00
LevelX2
eebc412ad9
Some updates to image download.
2017-09-15 23:19:11 +02:00
LevelX2
3fc3d96fe0
Some updates to image download.
2017-09-15 23:18:40 +02:00
LevelX2
d95a3e470c
Updated some logic.
2017-09-12 17:25:18 +02:00
LevelX2
a280605591
Some updates.
2017-09-10 10:19:14 +02:00
Evan Kranzler
252c941b4f
Refactored more subtypes usages to enum
2017-09-08 09:57:51 -04:00
LevelX2
96034c4c2b
Updated some logic.
2017-09-08 15:22:09 +02:00
LevelX2
c9327b718d
Updated some logic.
2017-09-06 17:49:55 +02:00
LevelX2
7329dc6c3f
Some more changes to image download.
2017-09-05 00:12:09 +02:00
LevelX2
5a1544050c
Updated image download handling.
2017-09-04 18:25:31 +02:00
LevelX2
d003cd898f
Image download by set with source restriction to supported sets.
2017-09-04 07:57:10 +02:00
LevelX2
452c05543d
Added Ixalan image download from mythic spoilers source.
2017-09-03 10:10:09 +02:00
LevelX2
a46538fc06
Removed some unused code.
2017-09-01 16:03:43 +02:00
spjspj
4fe4279239
Add in the C17 decks (Vampire and Cat one have 1 card not implemented each)
2017-08-31 02:11:05 +10:00
LevelX2
9ac7fe27f0
* Vindictive Lich (mode target handling not fixed yet).
2017-08-21 18:49:37 +02:00
spjspj
4687943176
Update penny dreadful list ( http://pdmtgo.com/legal_cards.txt )
2017-08-20 22:01:19 +10:00
spjspj
fc31753695
PD implement..
2017-08-19 16:08:19 +10:00
LevelX2
cb8b4d8cbf
Fixed some problems that table dialogs were not closed if the table controller closed the table.
2017-08-18 00:12:12 +02:00
LevelX2
1fb24116ae
xmage 1.4.26V0
2017-08-15 01:27:06 +02:00
LevelX2
bae7f154df
Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected.
2017-08-13 16:22:18 +02:00
LevelX2
9a1ce3f449
Merge pull request #3769 from Eleros/feature/HASCON2017Promos
...
Feature/hascon2017 promos
2017-08-04 22:39:20 +02:00
spjspj
6435b9950a
Add in Penny Dreadful EDH format (plus filter options for deck editor).
2017-08-04 17:13:25 +10:00
Saga\Robert
2e1a820040
- added gold color
...
- added gold Dragon Token
- edited new set data (H17) for Sword of Dungeons and Dragons
2017-08-01 14:55:17 +02:00
LevelX2
7b168a9d5e
* Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value.
2017-07-30 18:50:36 +02:00
LevelX2
fe2ee5dfec
Xmage 1.4.25V0
2017-07-29 20:35:16 +02:00
LevelX2
7ba051871d
* Fixed minor bug that the tables list was not cleared if no active table did exist.
2017-07-29 20:22:07 +02:00
LevelX2
a35abd7f8c
* Deactivated macro button, becuase it's not working correctly ( #2147 ).
2017-07-29 19:13:13 +02:00
LevelX2
5cca05dd23
* Fixed bug in download images logic ( fixes #3756 ).
2017-07-29 17:53:28 +02:00
LevelX2
052fbb3ab6
Merge origin/master
2017-07-29 17:39:36 +02:00
LevelX2
400bbba8e1
* Deactivated macro button, becuase it's not working correctly ( #2147 ).
2017-07-29 17:39:13 +02:00
spjspj
e8147a4860
Merge pull request #3755 from spjspj/master
...
Mana Circles for deck analysis
2017-07-30 00:00:12 +10:00
spjspj
b6a7998eab
Mana Circles for deck analysis
2017-07-29 23:55:58 +10:00
LevelX2
18cab46b05
* Improved editor search function, fixed some problems with search for split card rules.
2017-07-29 11:43:05 +02:00
LevelX2
cd6c7623ed
* Added missing imports, imports reorg.
2017-07-23 16:29:29 +02:00
spacemoses
19d1c7e987
Removing hardcoded User-Agent header causing error for card image retrieval
2017-07-22 13:23:49 -05:00
ingmargoudt
09f0c9ad97
huge rework on subtypes ( #3668 )
...
* huge rework on subtypes
* update for coat of arms
* fix test
2017-07-16 16:57:39 -05:00
LevelX2
60951f645b
* Removed magiccards.info as download source.
2017-07-16 19:10:10 +02:00
LevelX2
1fe841e6d9
Merge branch 'master' into master
2017-07-10 13:18:58 +02:00
fireshoes
48413a956a
Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist.
2017-07-09 16:51:57 -05:00
LevelX2
2b94ed232a
Fixed minor spelling error in preferences.
2017-07-09 15:31:32 +02:00
Benjamin Maitland
8e16cf0bd6
Added the Old School 93/94 Format. Uses original rules.
2017-07-08 23:40:27 -04:00
LevelX2
7d911ae803
XMage 1.4.24V0
2017-07-08 16:33:09 +02:00
fireshoes
a1c574bfda
Added Planechase Anthology, updated Media Inserts and Judge Promos
2017-07-07 14:27:29 -05:00
spjspj
495a84f1f1
Implement 2 cards (HOU) Fix for Bontu's Last Reckoning
2017-07-04 19:07:17 +10:00
spjspj
5a7a9049d9
Merge pull request #3549 from spjspj/master
...
Implement The Locust God (HOU)
2017-06-27 21:33:21 +10:00
spjspj
6d35de829f
Implement The Locust God (HOU)
2017-06-27 21:32:14 +10:00
LevelX2
9b31a5a7e3
Merge pull request #3516 from ruler501/summerproject
...
Shortcut/Macro System
2017-06-26 17:53:49 +02:00
spjspj
e683a579b3
Merge pull request #3512 from spacemoses/master
...
Enhancement #3222 - Adding scroll to clipboard import in deck builder
2017-06-25 23:16:21 +10:00
Devon Richards
fee630a0ac
Small cleanup
2017-06-24 11:23:58 -05:00
LevelX2
442d8ebc78
* Added HOU spoilers 2017-06-24.
2017-06-24 11:00:21 +02:00
Ben Homer
b68091683a
Added keybinding to preferences and improved UI appearance with new image file.
2017-06-22 01:42:01 -05:00
Devon Richards
0d98514550
Added better UI and made it work with most categories of combos
2017-06-21 01:09:54 -05:00
Devon Richards
028d7ed1f8
Initial working product. Doesn't handle skipping stack.
2017-06-20 19:54:16 -05:00
spacemoses
882060bf3e
Enhancement #3222 - Adding scroll to clipboard import in deck builder
2017-06-18 18:44:59 -05:00
Quercitron
0c9c7c0a56
Add scryfall.com as a source for card images ( closes #3496 ).
2017-06-17 17:55:35 +03:00
fireshoes
52b4633340
Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01.
2017-06-05 16:00:13 -05:00
LevelX2
b62a15f68e
Merge pull request #3454 from drmDev/add/welcomedeck2017
...
adding welcome deck 2017 (see #3453 )
2017-06-03 10:31:49 +02:00
Anders Åstrand
4d0e8cb443
Review fixes
2017-05-30 18:55:40 +02:00
Derek Monturo
1d662a0a58
adding welcome deck 2017 - closes #3453
2017-05-30 07:31:14 -04:00
Anders Åstrand
ad0507e739
Ban ignored users from watching
...
This commit bans ignored users from watching
games where the creator has them on their ignore list.
2017-05-29 21:36:42 +02:00
LevelX2
bd9b11fc49
Fixed some problems with popup window not been hidden if another frame is shown.
2017-05-27 14:35:50 +02:00
spjspj
e752ee3156
EDH Power level fix
2017-05-20 15:45:40 +10:00
spjspj
3cb7424dfd
EDH Power updates
2017-05-16 23:14:33 +10:00
spjspj
f85c7e07ba
Emblems refactor to show emblems in Card/Token Viewer
2017-05-14 13:43:18 +10:00
spjspj
5514787871
Merge pull request #3350 from spjspj/master
...
Allow sort by EDH Power level in Deck Editor
2017-05-11 17:54:23 +10:00
spjspj
347d08298f
Allow sort by EDH Power level in Deck Editor
2017-05-11 17:52:43 +10:00
LevelX2
ea439505ce
Some minor changes.
2017-05-09 17:02:30 +02:00
spjspj
0942db541f
Token refactor
2017-05-08 23:26:33 +10:00
spjspj
f909005bb1
Token refactor
2017-05-08 23:20:33 +10:00
spjspj
bec0964726
Token refactor
2017-05-08 21:53:01 +10:00
spjspj
a897b374a0
Token refactor
2017-05-07 20:57:57 +10:00
spjspj
ba6e8409d1
Token refactor
2017-05-07 11:46:52 +10:00
spjspj
e73e7d8600
Token refactor
2017-05-06 23:35:14 +10:00
bugfi5h
72ec960c95
Merge branch 'develop' into feature/CopperAngel
2017-05-01 15:10:56 +02:00
spjspj
3f125db074
Merge pull request #3271 from spjspj/master
...
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…
2017-04-30 11:15:54 +10:00
spjspj
0d0fccc105
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first.
2017-04-30 11:14:24 +10:00
LevelX2
3cc157bc2c
* Fixed null pointer exception problems in client.
2017-04-30 00:07:37 +02:00
spjspj
04f298923c
spjspj - Add in Tokens to the Card Viewer (fix)
2017-04-29 17:42:08 +10:00
spjspj
241691b153
spjspj - Add in Tokens to the Card Viewer (first version)
2017-04-29 17:25:54 +10:00
bugfi5h
217e294470
Added Card: Copper-Leaf Angel
2017-04-27 21:25:30 +02:00
igoudt
05785f71b9
Make the implementations of CardImageSource an enum
2017-04-27 10:57:48 +02:00
igoudt
3f47d5a253
put inputstream in try body so it can be autoclosed
2017-04-27 10:57:48 +02:00
igoudt
0528555075
make DefaulActionCallback an enum and remove unused parameter
2017-04-27 10:57:48 +02:00
igoudt
ce26e5c8dd
make the combatmanager an enum
2017-04-27 10:57:48 +02:00
igoudt
5b21f34941
rewrote gettypetext, added removeIf to TableModel
2017-04-27 10:57:48 +02:00
igoudt
27aea04820
move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription
2017-04-27 10:57:48 +02:00
Derek M
c4330415c1
Merge pull request #3241 from drmDev/master
...
Unit test confirming issue #3195 with Combat Celebrant
2017-04-25 22:09:14 -04:00
drmDev
04746c5f4f
Unit test confirming issue #3195 allowing Celebrant to attack while exerted
2017-04-25 22:07:51 -04:00
igoudt
c1ce821340
fix on playertype enum comparison
2017-04-26 00:37:06 +02:00
spjspj
4c85d89b64
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 20:12:21 +10:00
spjspj
a4e7c2b407
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 18:17:28 +10:00
spjspj
4ed9419cbf
Fill in missing str
2017-04-23 23:47:43 +10:00
spjspj
6ab4a94bd7
spjspj - Add in 'View Current Deck' option.
2017-04-23 13:06:09 +10:00
spjspj
8845d77628
spjspj - Remove View Limited Deck option
2017-04-22 19:35:08 +10:00
spjspj
0cd4e06e22
spjspj - Add a View Limited Deck option to allow you to see your deck during matches.
2017-04-22 19:16:12 +10:00
fireshoes
a86a1ebf5f
Added Iconic Masters to known-sets/mtg-sets-data.txt
2017-04-20 10:37:16 -05:00
fireshoes
ad3e5749f5
Added Planeswalker Decks to Sample Decks.
2017-04-19 11:46:20 -05:00
spjspj
7ca5adff89
Merge pull request #3169 from spjspj/master
...
Undo double tap of ok button (Leading to duplicate tournaments - Fixe…
2017-04-19 10:31:18 +10:00
spjspj
5373997b30
Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154 )
2017-04-19 10:30:40 +10:00
fireshoes
2c9c4888cc
Added Commander 2017 to known sets.
2017-04-18 11:39:47 -05:00
spjspj
cdd010ffa2
spjspj - Add in saved configurations for New Match and New Tournament dialogs.
2017-04-18 01:52:04 +10:00
spjspj
1fcb7d2963
Revert
2017-04-17 20:00:56 +10:00
LevelX2
ef4cf90a0f
Release 1.4.23V0
2017-04-17 10:53:59 +02:00
LevelX2
35791ac6b7
Set SocketWriteTimeout to 10 seconds.
2017-04-17 00:01:39 +02:00
LevelX2
ed341528d9
[AKH] Fixed that Aftermath card images were shown wrongly rotated.
2017-04-16 22:57:08 +02:00
Styxo
ee9613fa49
[AKH] Fixed wrong card names from MythicSpoiler download
2017-04-16 16:26:10 +02:00
LevelX2
e93218946c
[AKH] Fixed dwonload of Aftermath images from Mythicspoilers.
2017-04-16 14:07:21 +02:00
spjspj
7937bcda9e
Revert
2017-04-16 20:06:27 +10:00
LevelX2
bebb2a4de7
Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?).
2017-04-15 18:51:54 +02:00
Mark Langen
77586eec7e
Add 30 AKH card implementations
...
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
2017-04-15 04:24:14 -06:00
Mark Langen
b1ed5c3632
Fixed deck editor Drag & Drop
...
* Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).
2017-04-14 17:07:52 -06:00
fireshoes
0c9ad1e8b2
[AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas.
2017-04-13 10:10:59 -05:00
ingmargoudt
fea477dd04
fixed two lines to allow playing human-human tables
2017-04-11 07:54:54 +02:00
Mark Langen
c22a8f717e
Fix for problem introduced in 321f5597b7
...
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
2017-04-10 16:13:42 -06:00
Mark Langen
321f5597b7
Change main client window MagePanes from JInternalFrames to JLayeredPanes
...
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
2017-04-07 22:08:13 -06:00
ingmargoudt
1649530e7b
remove helper functions from cardUtil
2017-04-07 16:40:38 +02:00
ingmargoudt
314316f42f
moved inputstream for font to try clause
2017-04-07 15:19:11 +02:00
ingmargoudt
f519b12d0e
introduced isCreature/isLand/isArtifact/... etc for CardView
2017-04-07 15:08:28 +02:00
ingmargoudt
08197f192c
remove CardHelper class
2017-04-07 10:00:16 +02:00
ingmargoudt
d60e01d497
move CardHelper::getColor to CardView::getColorText
2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7
remove isCreature from CardHelper, move to Cardview
2017-04-06 22:07:59 +02:00
Mark Langen
047449f14e
* Correct type line rendering for split cards with different types on each half.
...
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
2017-04-04 21:58:52 -06:00
Mark Langen
a2e8cedd02
Merge branch 'master' into akh-card-frame
2017-04-04 18:36:37 -06:00
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
refactoring
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