John Hitchings
47c9aab877
Merge branch 'master' into additional-mulligan-support-5600
2019-03-19 23:39:39 -07:00
Oleg Agafonov
a50884f31d
* Images - fixed token images source from tokens.mtg.onl
2019-03-19 23:20:17 +04:00
John Hitchings
4a232b148c
Add mulligan options to NewTableDialog, passing mulligan information to games.
2019-03-19 06:08:12 -07:00
Oleg Agafonov
7140a41445
Merge pull request #5636 from hitch17/deck-exporters
...
Refactor Sets.saveDeck into a deck exporter series of classes.
2019-03-19 03:32:54 +01:00
Ingmar Goudt
bcf02e692c
rewrite to immutable list builder
2019-03-18 16:28:00 +01:00
Ingmar Goudt
72c8c267a1
move Google Guava to mage-root pom in dependencyManagement, so other modules can use it
2019-03-18 15:48:35 +01:00
Oleg Agafonov
2a0d2d125b
* UI: fixed error message window for long text (auto-size), improved wrong version message;
2019-03-18 09:00:27 +04:00
John Hitchings
0ea73b19df
Refactor Sets.saveDeck into a deck exporter series of classes.
2019-03-17 14:58:05 -07:00
Oleg Agafonov
bf2861c309
* UI: improved skip buttons and preferences:
...
* added new setting for STACK skip button: stops on full empty stack (default) or on new objects added;
* added new dynamic hints for skip buttons to see current settings and modes;
* fixed that some skip buttons not de-activated after goal was achieved;
* fixed wrong default render mode for cards, MTGO must be default (#4409 );
2019-03-17 04:38:31 +04:00
Oleg Agafonov
b6f075c505
* UI: added drag & drop text to deck editor (like drag & drop deck file);
2019-03-13 04:21:31 +04:00
Oleg Agafonov
a74d236ced
Added hint about "/FIX" command in game's welcome message;
2019-03-11 21:23:09 +04:00
Oleg Agafonov
1ad6dc9976
Merge pull request #5626 from hitch17/more-forgiving-button-presses
...
Simulate JButton behavior while still preserving check for BUTTON1
2019-03-11 17:39:52 +01:00
John Hitchings
5c01b38ed6
Rename pressing to tinting. Change to behavior when leaving the rect will remove the tint (would stop tinting only when button released).
2019-03-10 23:12:48 -07:00
John Hitchings
11b93d0771
Simulate JButton behavior while still preserving check for BUTTON1 using MouseAdapter. Add a slight tint when button is pressing, but not pressed.
2019-03-10 23:02:13 -07:00
Ingmar Goudt
7a5920322d
sonar cleanup in Sessionhandler
2019-03-10 22:04:27 +01:00
Oleg Agafonov
d8bee36892
* Multiple choosing abilities - added de-selection (click on selected permanent to de-select it);
2019-03-10 15:36:53 +04:00
Oleg Agafonov
b45864070c
* UI: added possible targets highlighting in targets pickup dialogs;
2019-03-10 02:12:52 +04:00
Oleg Agafonov
e08fe53672
Merge pull request #5612 from hitch17/dnd-deck-lists
...
Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor.
2019-03-08 01:03:07 +01:00
Ingmar Goudt
ee3f592186
fix some bugs from Sonar 06032019
2019-03-06 23:01:05 +01:00
Oleg Agafonov
e68b79336a
Typo fix
2019-03-06 14:06:47 +04:00
Ingmar Goudt
553d263526
add missing diamond operators
2019-03-04 11:57:53 +01:00
Ingmar Goudt
45f665eb1d
Sonar cleanups 03032019
2019-03-04 10:43:20 +01:00
Oleg Agafonov
e30eecead3
Refactor set's legality, Modern Horizons now available for modern formats;
2019-03-04 04:49:49 +04:00
Oleg Agafonov
106a5d94b2
MH1: added images downloads for Modern Horizons to scryfall;
2019-03-04 02:09:00 +04:00
John Hitchings
13efdd5b0b
Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor.
2019-03-03 13:48:51 -08:00
Ingmar Goudt
8319fbf9ad
replace public fields with encapsulation
2019-03-03 09:51:14 +01:00
spjspj
caf26c2b7b
Fix saving skill level for new table dialog of 'T1', 'T2'
2019-03-02 22:24:44 +11:00
Oleg Agafonov
38293e4659
* Improved network performance (traffic reduced from lobby by 60%);
2019-03-01 19:40:39 +04:00
Oleg Agafonov
f788af1f6a
* Improved connection performance on new release, no more empty cards on startup;
2019-03-01 18:55:20 +04:00
Ingmar Goudt
be37d58dac
fix compile
2019-02-26 10:56:39 +01:00
Ingmar Goudt
a64e31e697
sonar fixed 25022019
2019-02-26 09:20:15 +01:00
John Hitchings
f76efb2b65
Merge branch 'master' into migrate-google-collections-to-guava
2019-02-22 22:43:23 -08:00
Ingmar Goudt
3359c1f3f1
sonar 220219, criticals
2019-02-22 12:06:11 +01:00
Ingmar Goudt
056226d83c
Sonar fixes 19022019
2019-02-19 21:51:45 +01:00
Ingmar Goudt
872eea7326
small cleanups in DragCardGrid
2019-02-18 21:32:20 +01:00
Oleg Agafonov
8cf681dff2
Updated libraries to latest versions and code compatibility fixes;
2019-02-17 16:12:57 +04:00
Oleg Agafonov
971a98061d
Fixed SQL errors on non escaped symbols in usernames/emails/passwords;
2019-02-17 16:09:00 +04:00
Oleg Agafonov
9ef888c634
UI: symbols download fixes:
...
* fixed that mana symbols don't refresh after download finisged (#5592 , no more xmage restarts);
* fixed that window don't close after download finished;
2019-02-17 15:54:52 +04:00
Oleg Agafonov
232d37ec9b
Typo
2019-02-16 01:02:44 +04:00
Ingmar Goudt
f2c64629a5
couple of Sonar fixes
2019-02-15 13:31:10 +01:00
Ingmar Goudt
c8a4e7a46b
update JSoup, added test for Polluted Bonds, remove explicit parent groupId from poms
2019-02-11 15:03:18 +01:00
Ingmar Goudt
ff6dd3626f
Client: use Rarity enum rather than a String
2019-02-11 14:14:36 +01:00
John Hitchings
b18efe2fbf
Migrate from older version of google collections to guava. Required migration from MapMaker to CacheBuilder. See: https://github.com/google/guava/wiki/MapMakerMigration
2019-02-10 10:13:05 -08:00
Oleg Agafonov
067b0d75b5
UI: added premodern filter to tables list ( #5301 );
2019-02-09 21:08:22 +04:00
Oleg Agafonov
ff00d3c482
UI: added deck editor sets update on server connection (on new release);
2019-02-09 19:13:18 +04:00
Oleg Agafonov
264d81305e
UI: added card viewer update on server connection (on new release);
2019-02-09 18:08:15 +04:00
Oleg Agafonov
f58fb8d07b
Added new set Ravnica Allegiance Guild Kits (GK2) with 16 cards (scryfall download)
2019-02-09 16:53:42 +04:00
Oleg Agafonov
00ad61b6bd
Added new Mythic Edition (MED) set (16 cards, scryfall download)
2019-02-09 16:45:27 +04:00
Oleg Agafonov
c29b68f030
Disabled cards rating and classes preloading on startup (lags problem);
2019-02-09 16:09:07 +04:00
Oleg Agafonov
c52a3c8a48
Merge pull request #5580 from magefree/5497-dynamic-hints-for-cards
...
UI: Add dynamic hints for cards
2019-02-09 14:44:42 +04:00
Oleg Agafonov
f341d35ece
Hints: disable card hints in m15 render mode;
2019-02-09 12:00:24 +04:00
Oleg Agafonov
1b32793388
Added restrict effect hints to permanents;
2019-02-08 03:08:28 +04:00
Oleg Agafonov
806112c43a
UI: fixed missing svg symbols (13, 14 and Q)
2019-02-07 01:28:31 +04:00
Oleg Agafonov
043a7af086
Added condition hints with good/bad icons for cards
2019-02-05 13:05:10 +04:00
Oleg Agafonov
b36465e5c9
Refactor: removed unused custom set filters in SubType requests;
2019-02-04 00:53:51 +04:00
Oleg Agafonov
c7ccc332d5
UI: tables with free seats always shows on top of the games list;
2019-02-01 20:56:27 +04:00
Oleg Agafonov
e2bc691f0b
UI: fixed wrong icons alignment in main menu with big fonts
2019-02-01 19:10:21 +04:00
Oleg Agafonov
0697cbe24c
UI: added draft rating column to deck editor
2019-02-01 18:57:24 +04:00
Oleg Agafonov
0c8fdfcaf2
UI: added draft rating info in card viewer
2019-02-01 18:32:22 +04:00
Oleg Agafonov
7eba755666
Refactor card ratings, fixed rare error exception "comparison method violates its general contract" (different ratings in same card);
2019-02-01 17:41:29 +04:00
Oleg Agafonov
3739325000
UI: fixed that chat messages history was editable;
2019-01-26 19:31:12 +04:00
Oleg Agafonov
e4ca6749c0
* UI: added free seats colorozing in tables list (green color on free seats to joins)
2019-01-26 01:20:43 +04:00
Oleg Agafonov
481b5f04ea
Fixed NPE error/freeze on broken server connection
2019-01-25 10:41:50 +04:00
Oleg Agafonov
a6f851dc33
* Fixed broken svg symbols download
2019-01-23 19:02:30 +04:00
Oleg Agafonov
dd09de7a09
UI: fixed row selecting in tables list
2019-01-22 23:00:23 +04:00
Oleg Agafonov
4349ec881e
UI: fixed cell hints for sorted cols;
2019-01-22 20:51:41 +04:00
Oleg Agafonov
cfff0f8116
* UI: added game name and seats number columns to tables list;
2019-01-22 18:32:27 +04:00
Oleg Agafonov
12b8c12d74
Fixed NPE
2019-01-22 16:01:05 +04:00
Oleg Agafonov
8f80d2d5b1
* UI: table selection is no longer reset after lobby refresh;
2019-01-22 15:49:16 +04:00
Oleg Agafonov
0833f8b914
* UI: added cell hints to current and finished tables;
2019-01-22 14:16:56 +04:00
Oleg Agafonov
91a3328907
* UI: added cell hints to player's list in lobby, fixed header hints;
2019-01-21 01:10:01 +04:00
Oleg Agafonov
72c9370d98
Images: improved error messages, added cancel after too many errors;
2019-01-20 17:30:53 +04:00
Ingmar Goudt
e7c729f11c
Use autoclosable try-withs
2019-01-19 22:03:13 +01:00
Oleg Agafonov
f223bdab31
Added new client-server incompatible checks:
...
* added strict mode (client and server versions must be same, see MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME);
* you must enable string mode after github code changes in serializeable classes (see #4459 );
* added client-side version checks;
* added error message on wrong version disconnects.
2019-01-18 13:32:37 +04:00
Oleg Agafonov
c0ef84b4dc
Fixed deck file names for windows perl script compatible
2019-01-16 21:01:09 +04:00
Oleg Agafonov
14f66029f8
Missing v33 commit
2019-01-16 20:59:45 +04:00
Oleg Agafonov
45e0e1c3b2
UI: added beta and check online status buttons to connection dialog;
2019-01-16 13:26:53 +04:00
Oleg Agafonov
08c081f506
Images: fixed missing RNA land images (temporary replaced with GRN lands)
2019-01-15 21:29:01 +04:00
Oleg Agafonov
1202c1fb17
UI: fixed that users can't watch tournament's games
2019-01-15 21:07:43 +04:00
Oleg Agafonov
b8fbf1bc8e
Fixed images download for CON set in windows systems;
2019-01-15 05:43:55 +04:00
Oleg Agafonov
2ece7a9bb2
Merge remote-tracking branch 'origin/master'
2019-01-13 01:39:30 +04:00
Evan Kranzler
dc409c9a9e
refactored ColorlessPredicate to singleton enum
2019-01-12 16:15:19 -05:00
Oleg Agafonov
152c354ec3
Fixed cards db updates on auto-connection enabled;
2019-01-12 23:41:12 +04:00
Oleg Agafonov
d98a3eb30a
[RNA] fixed emblem download
2019-01-12 23:10:34 +04:00
Oleg Agafonov
2b8b244428
* UI: fixed that card viewer doesn't show emblems/planes on right page;
2019-01-12 22:45:24 +04:00
Oleg Agafonov
1b55cbd44c
[RNA] added tokens and download support from scryfall;
2019-01-12 21:13:56 +04:00
Oleg Agafonov
feeda20595
* Images: added tokens download from scryfall ( #4174 );
2019-01-12 10:44:12 +04:00
Oleg Agafonov
e1f8d97512
Refactor: removed outdated images code and fixed missing images logs for tokens;
2019-01-12 03:03:04 +04:00
John Hitchings
aac3e3fdc1
add importer for o8d and some more decks to test.
2019-01-10 19:33:42 -08:00
John Hitchings
5bf748e2b5
Move tests to the Mage directory and stub out looking up cards by names for tests.
2019-01-10 11:04:00 -08:00
John Hitchings
58e629dca6
Refactored DeckImporter and obsoleted DeckImporterUtil. Added/refactored a PlainTestDeckImporter as a base class for text formatted importers to extend.
2019-01-10 08:27:05 -08:00
Oleg Agafonov
bcbd1e87a6
Merge fix
2019-01-07 06:52:39 +04:00
Oleg Agafonov
f01b3d3ca3
Improved new version cleanup and more:
...
* fixed db cleanup on new version (sets + cards);
* fixed empty sets list after update;
* fixed NPE errors in sets list on new install/version;
* added joke sets filter to deckeditor.
2019-01-06 15:41:30 +04:00
Oleg Agafonov
253c580639
Fixed broken tables selection in lobby
2018-12-22 06:21:17 +04:00
Oleg Agafonov
0d949ca7e6
Typos
2018-12-22 01:05:43 +04:00
Oleg Agafonov
0c18f96ce7
Added set codes info in download window;
2018-12-22 00:01:37 +04:00
Oleg Agafonov
fbca0f4fef
Added RNA images support for scryfall, fixed MED set for scryfall, fixed bloated logs for machines without sound.
2018-12-21 20:09:01 +04:00
Oleg Agafonov
5d1289a66e
Merge pull request #5465 from magefree/ui-new-download-window
...
UI: added new download images window
2018-12-21 18:03:55 +04:00
Oleg Agafonov
c3ea8ddd7a
UI: added images cache reset after downloads finish (no more xmage restart for new images);
2018-12-21 17:53:24 +04:00
Oleg Agafonov
97c9659f1e
UI: fixed window download centered after startup complete
2018-12-21 17:35:41 +04:00
Oleg Agafonov
af5e48668e
UI: added cancel button for images downloading startup;
2018-12-21 17:31:55 +04:00
Oleg Agafonov
2fdef83284
Merge pull request #5455 from SpikesCafe-google/AddSpinyStarfish3
...
Add Spiny Starfish from Alliances.
2018-12-21 05:33:04 +04:00
John Hitchings
7e621ee8af
Make draft logs compatible with MTGO format #5450 - https://github.com/magefree/mage/issues/5450
2018-12-19 19:41:44 -08:00
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
