github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
34063 commits 2 branches 0 tags 782 MiB
Commit graph

3357 commits

Author SHA1 Message Date
ddzn
dd8e489fcb Add new deck type European Highlander 2021-01-07 13:31:08 +01:00
Oleg Agafonov
577ab1aa9a
Merge pull request #7300 from magefree/2020_commander_decks 
2020 Commander precon decklists
 2020-12-27 10:35:08 +01:00
Mike Simons
f408f533f7 remove layout from sample decks 2020-12-26 22:36:43 -05:00
Oleg Agafonov
b6e9c3edc2 Sample decks clean up from layout settings 2020-12-27 06:55:12 +04:00
Mike Simons
9a6d520ebc 2020 Commander precon decklists 2020-12-26 20:06:38 -05:00
Oleg Agafonov
fed97c040a * GUI: fixed that cast/played card can be visible in hand zone until end of the game or re-connect (#7297); 2020-12-27 01:39:18 +04:00
Oleg Agafonov
b8b2dd2c9b * GUI: fixed that abilities and triggers on the stack were not highlighted as valid target; 2020-12-24 21:43:17 +04:00
Oleg Agafonov
dd7c1939d3 * Game: fixed that Snow-Covered lands can be added to auto-generated or submitted/timeout decks (#7222); 2020-12-23 10:26:49 +04:00
Oleg Agafonov
b506c7fb53 Merge fix 2020-12-22 17:33:36 +04:00
Oleg Agafonov
0ac4a9d87a * Activate spell's ability on the stack - fixed that it can't be activated by humans (example: Lightning Storm); 2020-12-22 17:13:00 +04:00
Oleg Agafonov
d5377599cc * Images: updated Duels of the Planeswalkers Promo sets (year incremented; 2011 -> 2012, etc); 2020-12-21 11:10:54 +04:00
Oleg Agafonov
cc5fce4256 Prepare new release 2020-12-19 23:59:44 +04:00
Oleg Agafonov
9dd09c970a [CMR] added tokens support, added tokens download 2020-12-19 21:42:31 +04:00
Oleg Agafonov
74d96b98cf [KHM] added images download 2020-12-17 03:30:31 +04:00
Oleg Agafonov
db239a1055 Refactor: replaced sourceId by source and introduced source param in some methods; 2020-12-12 20:23:19 +04:00
Oleg Agafonov
be227defdc
Merge pull request #7088 from magefree/dependabot/maven/org.ocpsoft.prettytime-prettytime-4.0.6.Final 
Bump prettytime from 4.0.5.Final to 4.0.6.Final
 2020-11-20 19:29:31 +01:00
Oleg Agafonov
ae4f84655e Changed error report link to github 2020-11-20 17:59:12 +04:00
MusaBrt
e078644caf
removing unnecessary condition 
L152, null checking for initialized final field
 2020-11-18 01:11:31 +03:00
Oleg Agafonov
ea46afbe62 Prepare new release 2020-11-10 13:11:45 +04:00
Oleg Agafonov
5578437dde * GUI: increased ignore list max size from 100 to 500; 2020-11-09 00:42:43 +04:00
Oleg Agafonov
8fa0ba1cfd [ZNC] Added images and tokens support/download 2020-11-05 12:55:08 +04:00
Oleg Agafonov
6bc040ef6c [ZNR] Added tokens support and download 2020-11-05 12:22:55 +04:00
Oleg Agafonov
4893c5b1ac [ZNR] Improved modal double faces cards in GUI (#7012) 2020-11-01 10:03:09 +01:00
Oleg Agafonov
898d271c36 [ZNR] Improved GUI for modal double faces cards (#7012) 2020-11-01 10:03:09 +01:00
Oleg Agafonov
c60bf3ccef [ZNR] Added images download for modal double faces cards (#7012) 2020-11-01 10:03:09 +01:00
Evan Kranzler
5c65506720 [SLD] consolidated PSLD into main set 2020-10-05 21:39:53 -04:00
Gösta
43dcd13d16 added option to hide ability text overlay 2020-10-02 00:32:35 +02:00
dependabot[bot]
f38fd4e198
Bump prettytime from 4.0.5.Final to 4.0.6.Final 
Bumps [prettytime](https://github.com/ocpsoft/prettytime) from 4.0.5.Final to 4.0.6.Final.
- [Release notes](https://github.com/ocpsoft/prettytime/releases)
- [Changelog](https://github.com/ocpsoft/prettytime/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/ocpsoft/prettytime/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-28 05:28:11 +00:00
Oleg Agafonov
0cc39b26d7
Merge pull request #7053 from magefree/dependabot/maven/org.apache.xmlgraphics-batik-transcoder-1.13 
Bump batik-transcoder from 1.11 to 1.13
 2020-09-22 08:31:25 +02:00
Oleg Agafonov
cb2ae0295f * Performance: improved memory usage for images (now xmage will not eat all available memory on 2GB+ settings, see #6375); 2020-09-09 16:47:45 +04:00
vyacheslav.raskulin
b3dc0f5eca excessive lambda usage 2020-09-09 15:06:49 +03:00
vyacheslav.raskulin
8b31333d9d Collection creation is simplified 2020-09-09 15:03:01 +03:00
vyacheslav.raskulin
7da043afd0 comparation simplified 2020-09-09 15:00:30 +03:00
vyacheslav.raskulin
022c1407ed C-style arrays declaration should be replaced to java-style 2020-09-09 14:53:03 +03:00
vyacheslav.raskulin
b23ccb8191 since these branches are identical we may collapse them 2020-09-09 14:48:21 +03:00
vyacheslav.raskulin
e03b446601 explicit parameters are not needed 2020-09-09 14:47:47 +03:00
vyacheslav.raskulin
96b2094370 equals method can be simplified 2020-09-09 14:46:46 +03:00
Oleg Agafonov
5831ba81fc
Merge pull request #7030 from BrunoChevalier/master 
Additional fixes for pvs-studio report, see #7021 
* Rename BasicSaheekiSublimeArtificerTest.java to BasicSaheeliSublimeArtificerTest.java
* S3Uploader.java: Remove redundant null check
* Effects.java: remove redundant check. When in the else part, the lastRule already is guaranteed to not end on a dot
* TableController.java: change warning message when match == null to avoid nullpointer exception
* Reverted already fixed line from, see #7021
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2020-09-08 23:04:30 +02:00
Oleg Agafonov
9f0772fb65 Additional image files check after download 2020-09-08 18:23:11 +04:00
Oleg Agafonov
f670de09d9 * Images: added cleanup routine on startup (app will fix and delete all broken or temporary images files, see #6267); 2020-09-08 17:58:46 +04:00
dependabot[bot]
a0be42ed7b
Bump batik-transcoder from 1.11 to 1.13 
Bumps batik-transcoder from 1.11 to 1.13.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-07 05:57:07 +00:00
Bruno Chevalier
9b89eecab5 S3Uploader.java: Remove redundant null check 2020-08-31 13:50:23 +02:00
Oleg Agafonov
1967f9f6fa * GUI: added Historic set filter in deck editor; 2020-08-29 23:32:37 +04:00
Oleg Agafonov
ede06098e0 Fixed typos in tests and additional refactor 2020-08-29 19:04:26 +04:00
Oleg Agafonov
ab8a4eb26a Little fixes and code refactor 2020-08-29 18:09:44 +04:00
Oleg Agafonov
c67e937dfb GUI: fixed wrong options in download images dialog for some sources 2020-08-29 18:07:14 +04:00
Oleg Agafonov
a0c16dc4e1 Added charset check and hint in startup logs (related to #7020) 2020-08-28 08:34:01 +04:00
Oleg Agafonov
b610d0a31a Added default charset information in startup logs 2020-08-28 07:33:42 +04:00
Evan Kranzler
eff5f40c79 added Zendikar Rising 2020-08-26 16:22:12 -04:00
Evan Kranzler
9dadc12149 added Commander Collection: Green 2020-08-26 11:09:24 -04:00
Thomas Winwood
e01a03fa79
Add Signature Spellbook: Chandra (#7004) 
* Add Signature Spellbook: Chandra

* Update ScryfallImageSupportCards.java

* dangit

* Update SignatureSpellbookChandra.java
 2020-08-26 11:02:30 -04:00
Oleg Agafonov
8ce5c7f907 Fixed NPE on game.getState() usage 2020-08-26 13:34:08 +04:00
Oleg Agafonov
40fe3b137e * GUI: fixed that Historic games aren't visible in lobby list (now it visible under "other" filter); 2020-08-23 21:54:34 +04:00
Oleg Agafonov
994254e98c Added Historic in deck legality check 2020-08-23 02:06:24 +04:00
Oleg Agafonov
920697d2e5 Prepare new release 2020-08-23 01:52:55 +04:00
Oleg Agafonov
d076d13c27 Fixed sample deck 2020-08-22 19:46:38 +04:00
Oleg Agafonov
7aac355f4a Tests: added many verify checks for missing cards, names, numbers, download settings: 
* check wrong card numbers in sets;
* check missing cards from set;
* check wrong full art settings;
* check missing and unknown sets in scryfall download settings;
* check missing and unknown direct download links in scryfall download settings;
* improved ability text check results;
* removed unused tests for word checks;
 2020-08-22 15:16:30 +04:00
LevelX2
c16fb75668 * replaces all [source} by {this}. ATTENTION !!!: Only supporting [this} from now on in rule text. 2020-08-22 12:52:49 +02:00
LevelX2
d51acbf090 * Removed unused imports. 2020-08-22 11:51:34 +02:00
LevelX2
445f824424 * Added column hints to the headers of the list of active tables. Added some more details to the info column about rollback, spectators or planechase activated. 2020-08-22 00:48:13 +02:00
Oleg Agafonov
f0df880b17 Reverted wrong formated code 2020-08-17 05:22:59 +04:00
Oleg Agafonov
486c0d7c2c GUI: added problem cards selection on legality label clicks (#6854) 2020-08-17 05:15:31 +04:00
Oleg Agafonov
fcaacd8c1e GUI: deck legality improves: 
* Fixed wrong sorting;
 * Added tooltip errors limit (#6854);
 * Added tooltip size restrictions (#6854);
 2020-08-17 02:55:51 +04:00
htrajan
30348908dc fix tests 2020-08-15 00:50:46 -07:00
Oleg Agafonov
994dea99b3 Images: enable images download for Double Masters 2020-08-10 18:36:15 +04:00
Oleg Agafonov
8b2bc064cd Fixed test and sample decks 2020-08-10 18:24:21 +04:00
Oleg Agafonov
6a897fa8f8 * Other: fixed sample decks to actual card numbers, fixed broken sample decks; 2020-08-08 23:13:30 +04:00
Oleg Agafonov
c5d7a3e9f9 * GUI: added auto-fix for deck files on usage (if deck contains wrong card numbers then it will be fixed and saved automaticity); 2020-08-08 21:27:20 +04:00
Oleg Agafonov
9652d83aec Fixed tests 2020-08-08 19:08:38 +04:00
Oleg Agafonov
712af3152a Images download: 
* Fixed broken direct links download;
* Fixed outdated card numbers in some sets;
* Fixed all non-downloadable images from scryfall source;
 2020-08-08 18:55:10 +04:00
Oleg Agafonov
66a8994318 Tests: added sets implementation statistics in test_checkMissingSets 2020-08-08 14:02:28 +04:00
Oleg Agafonov
735588cc0d Sets refactor: 
* Duels of the Planeswalkers Promos set split to multiple sets (scryfall style);
* Fixed Masterpiece Series sets name;
 2020-08-08 13:17:49 +04:00
Oleg Agafonov
7599acf1c8 Removed duplicated sets that was split into multiple (Champs, Game Day, Launch Party, Media Inserts, Super Series) 2020-08-08 11:00:07 +04:00
Oleg Agafonov
f746d4d8d2 Images download: 
* removed duplicated set (Clash Pack);
* added images download for Eighth Edition Box, Ninth Edition Box;
 2020-08-08 10:14:17 +04:00
Oleg Agafonov
450646ca5e * Images download: added threads settings in download dialog; 2020-08-07 12:41:17 +04:00
Oleg Agafonov
401d468494 Images download: decrease default images threads to 3 instead 10 (scryfall IP ban workaround for massive download) 2020-08-07 11:48:40 +04:00
Oleg Agafonov
3bf0f80033 Images download: fixed broken download dialog 2020-08-07 11:29:49 +04:00
Oleg Agafonov
2954bbaf04 Images download: removed outdated source mtgimage.com 2020-08-07 11:28:03 +04:00
Oleg Agafonov
ffd98d5c3c Merge fixed 2020-08-07 11:08:30 +04:00
Oleg Agafonov
9e6a348cb1
Merge branch 'master' into refactor_promo_sets 2020-08-07 02:48:40 +02:00
Oleg Agafonov
e95b9f145c GUI: deck legality improves: 
* Added partly valid status for deck legality panel (if all cards are fine but user must add more cards to complete, see #6854);
 * Improved legality errors sorting (important errors visible at the top now, e.g. commander's errors);
 2020-08-03 02:03:54 +04:00
Oleg Agafonov
309b3f5636 GUI: deck legality and themes improves: 
* Improved formats list in deck legality panel (#6854);
 * Added hide button to deck legality panel (#6854);
 * Fixed themes names and added theme info in startup logs;
 2020-08-03 00:07:13 +04:00
Oleg Agafonov
c9c1bc2b90 GUI: added info about combat arrows bug on re-connect 2020-08-02 14:22:59 +04:00
Oleg Agafonov
00411b4a9b * Regeneration abilities improved: 
* Fixed that regeneration shield isn't added to permanent on aura sacrifice cost (example: Stamina, Carapace, see #2221);
 * Fixed that regeneration shields accumulated in attached aura instead permanent (bug example: re-attached aura gives old shields to new permanent, see #6846);
 * Added card hint with regeneration shields amount (#6846);
 2020-08-02 14:01:58 +04:00
Oleg Agafonov
2b82785e4a * GUI: improved attackers draw (if attacker was blocked then arrow colorizes with gray color); 2020-08-01 22:32:33 +04:00
Oleg Agafonov
610baac6ab GUI: improved feedback needed sound notifications (plays only for inactive game or app, see #6853); 2020-07-31 20:00:36 +04:00
Oleg Agafonov
1045f352bc GUI: fix that cheat button shows for all players instead current user only (related to #5289); 2020-07-29 20:22:25 +04:00
Oleg Agafonov
8c5b2b6e01 Added comments for some dependency usage (#6799) 2020-07-28 05:30:31 +04:00
Oleg Agafonov
02aa3b333f Removed db-files from client distribution; 2020-07-28 04:56:33 +04:00
dependabot[bot]
62d563b11f
Bump prettytime from 4.0.2.Final to 4.0.5.Final 
Bumps [prettytime](https://github.com/ocpsoft/prettytime) from 4.0.2.Final to 4.0.5.Final.
- [Release notes](https://github.com/ocpsoft/prettytime/releases)
- [Changelog](https://github.com/ocpsoft/prettytime/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/ocpsoft/prettytime/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:56 +00:00
dependabot[bot]
7dc4d2eb79
Bump aws-java-sdk-s3 from 1.11.498 to 1.11.827 
Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.498 to 1.11.827.
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.498...1.11.827)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:10 +00:00
Oleg Agafonov
857d888b76 GUI: fixed that deck validate from deck editor available in draft/sideboarding mode (#6854); 2020-07-25 15:39:43 +04:00
Oleg Agafonov
24aacaafe8 * GUI: fixed missing horizontal scrollbar in deck editor for small screens, fixed overlapped deck validate panel for small screens (#6881, #6854); 2020-07-25 15:27:17 +04:00
Oleg Agafonov
e07dd273f2 * GUI: fixed that deck editor doesn't restore settings after games (cards list hides after draft/sideboarding, see #4350); 2020-07-25 13:29:51 +04:00
Oleg Agafonov
5585e1d878 GUI: deck editor improves: 
* Fixed broken DeckArea form (form/java files synced);
* Improved panel sizes and scrolls fixes (small screens support, see #6881);
 2020-07-25 12:12:05 +04:00
LevelX2
881f727ec7 * Fixed visibility of buttons with empty text (fixes #6841). 2020-07-20 11:12:33 +02:00
18ths
99d5eafc8a
GUI enchancements (themes, sound notification, deck validation) (#6755) 
GUI enchancements (themes, sound notification, deck validation)
 2020-07-17 19:15:02 +02:00
Oleg Agafonov
656e4304ae * Images: fixed images download of special or promo cards without english version (example: Mysterious Egg, see #6829); 2020-07-11 06:35:55 +04:00
Oleg Agafonov
ac0bb713d7 * GUI: fixed auto-generated names for AI in new tournament dialog; 2020-07-10 17:57:56 +04:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +04:00