github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-17 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
28326 commits 2 branches 0 tags 782 MiB
Commit graph

2608 commits

Author SHA1 Message Date
Oleg Agafonov
3ca57533b5 Fixed wrong class package, pom config and broken code (visual studio code compatibility) 2019-04-03 02:45:52 +04:00
Oleg Agafonov
b7e68f3e0a * Fixed client crush on old systems without JavaFX supports like MacOS 10.9; 2019-04-02 08:20:48 +04:00
Oleg Agafonov
f8b9e3d408 Added more game mode and deck type combinations for commander; 2019-03-29 18:30:17 +04:00
Oleg Agafonov
ff640a942e UI: improved skips and stops for declare blocker step: 
* added options to STOP skip on any or zero blockers available;
 * added auto-stop before declare blockers step (e.g. user can cast instants and crew abilities);
 2019-03-29 18:10:00 +04:00
Oleg Agafonov
6606b586a4 UI: added what's new button to message of the day panel and connection dialog; 2019-03-29 10:41:49 +04:00
Oleg Agafonov
ad9ba216f2 UI: news page saves cookies for analytics; 2019-03-29 09:26:26 +04:00
Oleg Agafonov
7c8ba650a2 UI: news page shown only on new posts available; 2019-03-29 02:08:17 +04:00
Oleg Agafonov
16efc350b4 * UI: fixed graveyard and other cards window size (removed unnecessary scrolls, #5659); 2019-03-28 21:41:20 +04:00
Oleg Agafonov
01adbcf96f Refactor 2019-03-28 17:09:23 +04:00
Oleg Agafonov
771fac97ef * UI: fixed choose cards dialog size (removed unnecessary scrolls); 2019-03-28 17:06:03 +04:00
Oleg Agafonov
0e6dbb4eed * UI: improved and fixed possible targets highlighting: 
* added blockers highlighting on declare blockers step;
   * fixed that blocker targets highlights all attackers instead real;
   * fixed wrong attackers draw in images render mode;
 2019-03-28 09:29:15 +04:00
Oleg Agafonov
c58b28f94f UI: fixed rare error with wrong dialog position after multiple popups (#4318); 2019-03-28 09:19:16 +04:00
Oleg Agafonov
14f90bfc77 UI: added debug tool to test modal/non-modal dialog system (available from debug menu); 2019-03-28 09:12:17 +04:00
Oleg Agafonov
79c6626085 UI: added debug menu for developers (use -debug param in clients's command line to activate debug menu); 2019-03-28 09:11:09 +04:00
Oleg Agafonov
d45e63d946 * UI: added "what's new" page dialog with latest news (auto-loads on startup or from about dialog); 2019-03-28 09:05:46 +04:00
Oleg Agafonov
70f41c7807 Little fixes 2019-03-23 15:44:55 +04:00
Oleg Agafonov
66403cbdbb UI: improved add lands dialog (centered window, hotkeys to close/add); 2019-03-23 15:43:34 +04:00
Oleg Agafonov
1942cd0dec * UI: added save/load/reset game settings for new tourney dialog; 2019-03-23 15:08:05 +04:00
Oleg Agafonov
1b79827b2d * UI: added save/load/reset game settings for new table dialog; 
Fixed that edh power level don't saves;
 2019-03-23 06:54:17 +04:00
Oleg Agafonov
42658d5cff UI: added mulligan option to new tournament dialog, added mulligan type saving; 2019-03-23 05:49:21 +04:00
Oleg Agafonov
b925977efd Fixed new table/tournament dialogs compatibility with NetBeans editor; 2019-03-23 05:07:05 +04:00
Oleg Agafonov
3330680e81
Merge pull request #5644 from hitch17/additional-mulligan-support-5600 
Additional mulligan support #5600
 2019-03-22 22:48:18 +01:00
Oleg Agafonov
270ec615af Sync old changes 2019-03-22 21:51:26 +04:00
Oleg Agafonov
dc0da80d82 * UI: added deck export to clipboard (#4243); 2019-03-22 20:14:24 +04:00
Oleg Agafonov
4fde77b05e * UI: added paste button to import from clipboard dialog; 2019-03-22 18:22:07 +04:00
Oleg Agafonov
e471fc9888 UI: improved import from clipboard dialog and fixed compatibility with NetBeans; 2019-03-22 08:04:28 +04:00
Oleg Agafonov
04cb20f46a UI: improved deck editor exports: 
* added deck export to files (#4243);
 * fixed wrong card sorting in deck files after save (#3719);
 2019-03-21 19:17:41 +04:00
Oleg Agafonov
8b5993805a * UI: improved deck editor buttons and dialogs, prepared for export; 2019-03-21 05:20:57 +04:00
Oleg Agafonov
b848bbfb65 Fixed broken Deck Editor form -- now it's possible to load and edit by NetBeans 2019-03-21 00:11:17 +04:00
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
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
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
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
e7d129a074
Merge branch 'master' into add-minimum-rating-option 2018-11-26 17:18:35 +01: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