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

3668 commits

Author SHA1 Message Date
Alex Vasile
015cdf3136
Revert "Added missing fields to many copy constructors. (#8957)" (#8999) 
This reverts commit 82708e4273.

Some of these (AI related result in bloated memory usage, needs more investigation).
 2022-05-25 12:57:24 -06:00
Alex Vasile
82708e4273
Added missing fields to many copy constructors. (#8957) 2022-05-25 09:51:18 -06:00
Oleg Agafonov
e3332fbea8 Fixed miss image for FaerieDragonToken 2022-05-24 09:09:14 +04:00
PurpleCrowbar
4a167b3a17
Added token images for SNC (#8946) 
* Fixed knight token images from the DOM set not displaying

* Fixed the name reference of RNA's thopter token

* Fixed misspelling regarding Tibalt, Cosmic Impostor's emblem token causing it not to show in game

* Updated Faerie Dragon token to be present in game

* Removed redundant code regarding KLD constructs and improved thematic consistency

* Added Scryfall token download links for DTK

* Added support for and assigned SNC token images
 2022-05-24 09:06:51 +04:00
Evan Kranzler
a705064c67 [40K] added set and spoiler 2022-05-12 19:34:37 -04:00
sprangg
a115d1c542 Random pack selector dialog has space to show all the sets, also made resizeable 2022-04-28 02:36:39 +03:00
PurpleCrowbar
80f6ceccff
Add token images for several sets (#8873) 
* Added support for and assigned UMA token images

* Added Scryfall token download links for MMA

* Added Scryfall token download links for SHM

* Fixed last commit and Oona token names

* Added support for and assigned NEO token images

* Added support for and assigned NEC token images

* Added support for and assigned SLD token images

* Added support for and assigned 2XM token images

* Fixed Tuktuk and some naming inconsistencies

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed tokens with same names not displaying correctly
 2022-04-26 18:34:21 +04:00
Evan Kranzler
92a9604ed4 [NCC] added set 2022-04-07 19:20:37 -04:00
Evan Kranzler
26ae7b7281 replaced various instances of instanceof lambda functions with 2022-04-03 11:11:07 -04:00
Evan Kranzler
9d46caee9c [CLB] added set 2022-03-25 07:37:05 -04:00
Alex W. Jackson
77433d7ee6 Remove more duplicate tokens and rename some tokens to more generic names 2022-03-15 04:23:10 -04:00
Evan Kranzler
9e0ea945ca
Refactoring token names to reflect new rule (ready for review) (#8446) 
* updated Riptide Replicator and Volrath's Laboratory

* refactored token names

* some test fixes

* more test fixes

* even more test fixes

* the final test fixes

* fixed a few missed tokens

* merge fix

* fixed a test failure

* fixed test failure

* updated ignored verify test

* fixed token images not appearing

* updated tests
 2022-03-14 22:37:21 -04:00
Evan Kranzler
db7eb398cc fixed multicolored split cards rendering 2022-03-11 09:25:54 -05:00
Daniel Bomar
e0008fdcb2
Remove dead image scaling library 2022-03-09 19:33:35 -06:00
Jeff Wadsworth
153998cae3 - text fixes CallbackClientImpl 2022-03-07 16:03:25 -06:00
Alex W. Jackson
baece6e241 [CON] Remove a duplicate token 2022-03-07 14:59:01 -05:00
Evan Kranzler
670c2a5615 [SLX] added set 2022-03-04 07:55:57 -05:00
Evan Kranzler
eb7ed69b5a [SNC] added set 2022-03-03 19:31:24 -05:00
Evan Kranzler
0d3c4a946b renamed WPN sets to match new scryfall names 2022-03-03 09:17:57 -05:00
Evan Kranzler
d21913c316 [Y22] added set 2022-03-01 17:46:52 -05:00
Evan Kranzler
4dfd0867ed [DBL] added image download 2022-02-18 23:39:39 -05:00
Evan Kranzler
cfc368692f [NEC] added image support 2022-02-18 22:27:03 -05:00
Evan Kranzler
54203c16d3
[NEO] Implementing Compleated mechanic and hybrid phyrexian mana (ready for review) (#8677) 
* [NEO] Implemented Tamiyo, Compleated Sage

* replaced PhyrexianManaCost calls with ManaCostsImpl calls

* updated phyrexian mana implementation

* added phyrexian hybrid symbol support

* updated starting loyalty implementation for planeswalkers

* change compleated to singleton

* implemented Compleated ability

* added some missing loyalty setters

* changed when loyalty is added to a walker to fix bugs

* slight change to some tests to fix them from failing

* fixed token issue
 2022-02-10 10:25:23 -05:00
Oleg Agafonov
e1f45fe787 [NEO] added images support 2022-02-07 09:16:59 +04:00
Oleg Agafonov
3cb721fbd9 [VOW] added tokens and images support 2022-02-05 14:44:46 +04:00
Oleg Agafonov
424fc919a7 [VOC] added tokens and images support 2022-02-05 13:03:35 +04:00
Oleg Agafonov
54a1efec63 [MID] added tokens and images support 2022-02-05 12:22:39 +04:00
Oleg Agafonov
be114bb592 [MIC] added tokens and images support 2022-02-03 21:40:34 +04:00
Oleg Agafonov
0cb9266a15 [AFC] added tokens and images support 2022-02-02 13:13:49 +04:00
Oleg Agafonov
a6b2bea8af Images: added direct image links support in scryfall, added SLD's alternative images from second sides (example: Zndrsplt, Eye of Wisdom); 2021-11-28 01:17:54 +04:00
Oleg Agafonov
903a9215cc * Images: fixed wrong token filter and stats in images download dialog (#8443); 2021-11-27 23:09:11 +04:00
Oleg Agafonov
afdae939c3 * Becomes a copy abilities: improved support with MDF cards (#8335); 2021-11-17 16:27:18 +04:00
Alex W. Jackson
c355834a4e Fix #8337, #8456 2021-11-14 14:13:31 -05:00
Oleg Agafonov
83d44b3e66 Dev: updated to latest ormlite lib, removed workaround for dirty logs from #8373; 2021-11-14 01:47:24 +04:00
Oleg Agafonov
23bcc9dbb5 * GUI: fixed that card viewer or deck editor doesn't show transform button for some cards (#8448); 2021-11-14 00:33:37 +04:00
Alex W. Jackson
5287e1aa4d CardCriteria: use constants instead of strings for supertype and subtype 2021-11-11 05:50:13 -05:00
Oleg Agafonov
3284cb5b24 GUI: fixed wrong card sides, data and errors for transform and double side cards; 2021-11-09 10:16:39 +04:00
Oleg Agafonov
1f381cffe5 GUI: improved cards with transform ability: 
* added transform button to permanents on battlefield to view another card side;
* fixed wrong popup hints in some use cases (example: alternative side view by mouse wheel down, #8433);
 2021-11-05 23:16:44 +04:00
Evan Kranzler
04646a5a62 [VOC] added set 2021-10-28 20:06:40 -04:00
Evan Kranzler
653df7737b [VOW] added set 2021-10-28 20:04:42 -04:00
Evan Kranzler
4c93eda485 removed obsolete todo 2021-10-14 08:12:00 -04:00
Evan Kranzler
cfef00f90b small rework of MageBook card stats, removed 500 number limit 2021-10-14 08:09:27 -04:00
Alex W. Jackson
aac6518c1b Remove unofficial Eighth Edition Box and Ninth Edition Box sets 2021-10-14 04:21:16 -04:00
Oleg Agafonov
71d5887106 Fixed unnecessary logs on app startup (#8373); 2021-10-06 12:01:50 +04:00
Oleg Agafonov
58ab020065 Dev: pom clean up, improved parent/child structure; 2021-10-03 18:11:56 +04:00
Oleg Agafonov
08407eef25 Dev: migrated to single logger lib (replaced slf4j usage by log4j), clean up and documented pom files, updated some libs; 2021-10-02 11:09:09 +04:00
Oleg Agafonov
1c6eb10bd1 Dev: migrated to single json lib (removed json-simple from deck import code), clean up guava lib usage in cards; 2021-10-01 17:57:54 +04:00
Oleg Agafonov
c899c332b8 Dev: updated json lib, added tests; 2021-10-01 13:41:54 +04:00
Oleg Agafonov
f9beed6a89 Dev: clear pom files, fixed wrong test packages and scope, added zip tests; 2021-09-29 16:01:36 +04:00
Oleg Agafonov
42325c7c2e AI improves: 
* AI: fixed that AI was able to targeting an invalid player targets in some use cases (#5630);
* AI: fixed that AI was able to ignore targeted triggers in some use cases;
* AI: improved player targeting for not own chooses (if it's make a choice for another player);
 2021-09-26 18:40:26 +04:00
Oleg Agafonov
6bc5a00e8a * Alternative costs - fixed that it can be activated on free cast (example: cascade with overload, #6925, #7410, #7741, #6342); 2021-09-21 14:22:46 +04:00
Oleg Agafonov
61288b6439 * GUI: fixed wrong card icons drawing in choose triggers/piles dialog (#8225); 2021-09-20 02:44:46 +04:00
Oleg Agafonov
46081d9185 GUI related improves: 
* GUI: fixed that choose triggers/piles dialog doesn't close correctly before cast mode choose (#8225);
* GUI: fixed that some choose dialogs doesn't update battlefield state (example: choose amount, choose mana);
* Game: fixed duplicated json logs at the game's end;
 2021-09-20 02:17:22 +04:00
Oleg Agafonov
b6f9d57216
Merge pull request #8251 from fearphage/preferred-has-3-rs 
corrected typo: prefered -> preferred
 2021-09-11 19:24:38 +04:00
Phred
2b2f30a88a
corrected typo: prefered -> preferred 
ag -l prefered | xargs sed -i 's/refered/referred/g'
 2021-09-11 10:03:10 -05:00
spjspj
67c07ecefc Update for Full Art Face art. 2021-09-12 00:49:00 +10:00
spjspj
5bbcf03cb6 EDH Power level update (based on Saltiest EDHREC survey). Update for Full Art Face art. 2021-09-11 23:32:34 +10:00
Oleg Agafonov
fe4d4c0834 * GUI: fixed that choose from list dialog can fizzle some effects like Haunting Voyage (#8223); 2021-09-05 12:14:58 +04:00
Alex W. Jackson
bbe473c7d7 Fix #8075 for real this time 2021-09-04 13:13:06 -04:00
Evan Kranzler
a8194d2a64 [MIC] added set 2021-09-02 20:13:33 -04:00
Oleg Agafonov
2158d682cc Prepare new release 2021-08-30 14:44:03 +04:00
Oleg Agafonov
8bd1a9cde5 GUI: fixed that dungeon card hint doesn't hide after choose dialog, fixed working card hint on empty space in choose dialog (#8012); 2021-08-30 10:10:26 +04:00
Oleg Agafonov
1809fb516a * GUI: added card hints with current and next rooms in card rules (#8012); 2021-08-29 01:01:01 +04:00
Oleg Agafonov
65761b085f * Game: fixed wrong booster pass order in drafts (#8075); 2021-08-28 13:17:57 +04:00
dependabot[bot]
59571d0a03
Bump jsoup from 1.13.1 to 1.14.2 in /Mage.Client 
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.13.1 to 1.14.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.13.1...jsoup-1.14.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 20:51:59 +00:00
Oleg Agafonov
2b2a2d085a [AFR] added dungeon support in image/card view, images download, Card Viewer, verify tests; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
654ee7791c [AFR] added tokens and images download support; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
fb4065ba66 Little fixes 2021-08-20 09:38:16 +04:00
Oleg Agafonov
fb540e9728 * GUI: fixed multiple bugs and performance issues with Deck Editor and sets filter/search; 2021-08-19 21:33:14 +04:00
Oleg Agafonov
a691d6a45b Typo fix 2021-08-16 02:10:04 +04:00
Oleg Agafonov
43bdab8636 * GUI: added yes/no auto-answers for state base actions dialogs (example: commander change zone); 2021-08-16 02:00:53 +04:00
Oleg Agafonov
c328c71ef9 GUI: chats code upgraded to use new popup hint code; 2021-08-15 10:47:19 +04:00
Oleg Agafonov
d587cc9151 * GUI: added card popup info in choose dialog (example: choose dungeon, #8012); 
* GUI: added texts popup info in choose dialog (example: choose from any list);
 2021-08-14 09:18:50 +04:00
spjspj
e29b22df6e Add in decreasing rectangle spiral for paper original dual lands 2021-08-12 00:21:41 +10:00
Oleg Agafonov
36affdcdeb Merge fix 2021-08-09 11:36:56 +04:00
Oleg Agafonov
c9ab896d24 * GUI: added auto-choose for replacement effects (remember answer in dialog + reset answer in popup menu + new option in preferences; #4360, #328, #4219, #6676, #7914); 2021-08-09 11:26:11 +04:00
Evan Kranzler
b9ebac5575 [J21] re-added image downloads 2021-08-07 07:47:53 -04:00
Evan Kranzler
985c90c484 [J21] temporarily remove image downloads 2021-08-06 17:35:42 -04:00
Oleg Agafonov
f3e38f1026 * Images: fixed images download for some sets (ANA*, OGW, see #8082); 2021-08-06 23:56:00 +04:00
Evan Kranzler
b10b3da8f0 [J21] added set 2021-08-06 08:08:33 -04:00
Evan Kranzler
ecd8e5a190 [MID] added image download 2021-08-05 22:03:57 -04:00
Oleg Agafonov
f334b81de6 * GUI: fixed that users can select empty timing option in new tourney dialog; 2021-07-26 14:42:42 +04:00
Oleg Agafonov
5dcdbcfd4f * GUI: fixed wrong deck validation in Deck Editor for partners and planeswalker's commanders; 2021-07-25 10:31:22 +04:00
Oleg Agafonov
c6a3d5e588 Prepare new release 2021-07-25 01:15:33 +04:00
Oleg Agafonov
b214e61e9c Replaced servers status page with new link (will work later); 2021-07-24 17:25:43 +04:00
Oleg Agafonov
18687fe197 Merge fix 2021-07-24 04:55:44 +04:00
Oleg Agafonov
4d1985476f * GUI: added card icon for commander on battlefield; 
Card icons: added support of custom card icon colors;
 2021-07-23 19:51:45 +04:00
Oleg Agafonov
06ae494c5b Drafts: refactor to use same pack/pick number logic (#8039); 2021-07-23 16:18:56 +04:00
Oleg Agafonov
400acae0c1 * Draft improves: 
* added additional and improved timing options for pick timeouts (x1.0, x1.5, x2.0, see #8033);
 * added pick timing info in tables list (info column);
 * fixed that booster draft starts with wrong pick timeout (#8036);
 2021-07-22 23:14:08 +04:00
Oleg Agafonov
28473c7bd0 * GUI: added popup menu to view player's outside/sideboard at any time (allows to view only own or computer's sideboards); 2021-07-21 13:44:35 +04:00
Oleg Agafonov
f48da4c923 * GUI: fixed that look at and reveals dialogs doesn't show card's playable status; 2021-07-21 03:34:43 +04:00
Oleg Agafonov
7ccb390e4d * GUI: added card icon for announced X value (activate ability); 2021-07-19 14:25:51 +04:00
Oleg Agafonov
12aa3b82b8 * GUI: added card icon for face down permanents; 2021-07-18 21:13:03 +04:00
Oleg Agafonov
2d8be6663b [AFR] added card icons with class level info (#7808) 2021-07-15 23:46:19 +04:00
Evan Kranzler
b17eac0b76 [AFC] added image support 2021-07-10 08:02:41 -04:00
Evan Kranzler
572104b8fc
Reworking card types in preparation for implementing Grist, the Hunger Tide (#7899) 
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-07-09 07:28:43 +04:00
Evan Kranzler
5b1a38b426 [AFR] Implemented Death-Priest of Myrkul 2021-07-05 16:36:36 -04:00
Oleg Agafonov
6e26a8d7a6 [MH2] added tokens and images download; 2021-07-05 22:21:03 +04:00
Oleg Agafonov
27a55529a9 [STX] added tokens and images download; 2021-07-03 23:28:34 +04:00
Oleg Agafonov
6a3f2ff420 * Images: added Commander 2021 tokens; 2021-07-03 22:49:15 +04:00
Oleg Agafonov
4b6fae663f * Images: fixed broken download of some promo double faces cards (#7891); 2021-07-01 16:37:57 +04:00
Oleg Agafonov
2a05343bb8 Cards and images download fixes: 
* Cards: added new promo cards in some old sets;
* Cards: fixed card rarity in some old sets (Antiquities, Deckmasters);
* Images: fixed broken download of promo cards from some old sets (#7891);
 2021-06-30 22:17:30 +04:00
Oleg Agafonov
63558902c0 Merge fix 2021-06-30 17:58:34 +04:00
Oleg Agafonov
a5dfe3ba14 * Cards: updated old sets with new scryfall numbers (fixed images download); 2021-06-30 16:51:01 +04:00
Oleg Agafonov
e05a315495 * Cards: updated old sets with new scryfall numbers, fixed set codes; 2021-06-30 03:02:19 +04:00
Evan Kranzler
bb591dd038
[AFR] Implementing dungeon mechanic (ready for review) (#7937) 
* added dungeon and dungeon room class

* [AFR] Implemented Tomb of Annihilation

* [AFR] Implemented Shortcut Seeker

* [AFR] Implemented Gloom Stalker

* [AFR] Implemented Nadaar, Selfless Paladin

* added room triggers

* added more venturing code, currently untested

* fixed error

* moved venture into dungeon from player class to game class

* removed unnecessary sourceobject from dungeon

* fixed npe error

* added dungeon completion

* fixed concurrent modification exception

* added logging

* added proper copy methods

* added views

* updated room text generation

* added some missing code

* finished implementing CompletedDungeonCondition

* [AFR] Implemented Ellywick Tumblestrum

* [AFR] Implemented Lost Mine of Phandelver

* added choice dialog for dungeons

* [AFR] Implemented Dungeon of the Mad Mage

* small text fix

* added initial dungeon test

* [AFR] Implemented Cloister Gargoyle

* [AFR] Implemented Dungeon Crawler

* small text change for dungeon rooms

* added more tests

* some simplification to dungeon props

* updated testing helper functions

* added currently failing test for venturing on separate steps and turns

* added tests for dungeon completion

* fixed missing trigger visual and dungeons not persisting through turns

* some text updates

* added rollback test

* added a test for multiple dungeons at once

* added one more condition test
 2021-06-29 06:57:43 -04:00
Oleg Agafonov
67ee6fbf25 * GUI: improved cards auto-sorting in deck editor, fixed some sorting bugs for separate mode (#7789); 2021-06-28 00:39:26 +04:00
spjspj
9366e8c0b7
Update TableModel.java 2021-06-18 00:39:25 +10:00
spjspj
ae2787f119 Add in color identity as a sortable option in the deck editor and draft editor 2021-06-18 00:36:38 +10:00
Evan Kranzler
df6acb697d [H1R] changed set from RMH1 to H1R (fixes #7903) 2021-06-12 18:50:55 -04:00
Evan Kranzler
9fba3be2d5 [RMH1] added set 2021-06-02 21:41:31 -04:00
Evan Kranzler
d49cbede43 [STA] added image support 2021-05-24 19:53:56 -04:00
Evan Kranzler
b3b5ee418f added some image support 2021-05-24 09:31:14 -04:00
Evan Kranzler
7665977434 fixed a test failure 2021-05-01 18:47:32 -04:00
Michael Lee
af59cea62c
Fixing issue with GUI events being triggered prematurely when loading prefs (#7785) 2021-04-29 19:02:25 +04:00
Michael Lee
a4f195c0c6 Resizing GUI elements live from the preference menu 2021-04-28 16:41:10 -04:00
Evan Kranzler
a61d5543fa replaced all instances of converted mana cost with mana value 2021-04-17 17:02:27 -04:00
Daniel Bomar
600cac6fc7
[READY FOR REVIEW] Implement a "multi-amount" dialog (#7528) 
* Implemented chooseTargetAmount and new GUI dialog (distribute damage, distribute mana)
* Added tests and AI support;
* Test framework: added aliases support in TargetAmount dialogs;

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-17 14:28:01 +04:00
sprangg
81f12c3f45
Add possibility to play less rounds of swiss than xmage suggests (#7729) 
* Make it possible to adjust the number of rounds in a swiss tournament to be less than the number of rounds suggested by xmage.

Co-authored-by: sprangg <a@b.c>
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-14 09:54:29 +04:00
Oleg Agafonov
1373675073 [KLR] added images support 2021-04-02 11:33:11 +04:00
Evan Kranzler
043aae6dff updated phrasing on player choice messages 2021-03-23 19:46:47 -04:00
Oleg Agafonov
ccc85c1acb [TSR] added tokens 2021-03-07 03:08:17 +04:00
Oleg Agafonov
d3b787b9a6 [TSR] added images download 2021-03-07 03:08:17 +04:00
Oleg Agafonov
9d72dad674 [ZNE] added images download 2021-02-27 22:16:19 +04:00
Oleg Agafonov
608f6f7bd8 [STX] added images download 2021-02-27 22:03:20 +04:00
ddzn
0f91524c26 Add Eurolander to others button in tables panel 2021-02-21 14:09:01 +01:00
Oleg Agafonov
b6cb5cef9c Refactor: removed default comment headers 2021-02-21 08:15:16 +04:00
Oleg Agafonov
2dfde7f41a Refactor: correct predicate packages 2021-02-21 08:00:21 +04:00
Oleg Agafonov
4f10fa6d01 * GUI: fixed outdated description of "show ability picker" option in preferences (#7582); 2021-02-15 12:42:31 +04:00
Oleg Agafonov
eb64a7bb73 GUI: fixed broken add lands and random deck dialogs in deck editor (#7562); 2021-02-13 20:26:06 +04:00
Oleg Agafonov
1239a0299b GUI: fixed rare NPE error on images loading in the games; 2021-02-13 17:03:15 +04:00
Oleg Agafonov
42364f7e27 Server: fixed NPE error on wrong AI usage in new game dialogs (fixes #7556); 2021-02-13 14:54:13 +04:00
Oleg Agafonov
10e557b873 * Performance: memory usage optimization for deck editor (part 2 of removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:12:18 +04:00
Oleg Agafonov
c1dea5b21e * Performance: memory usage optimization for deck editor (improved search for low end computers, see #7177); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
275e996c08 * Performance: memory usage optimization for deck editor (removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
f9b840e3b5 * Images: added download support of localized images for double faces cards; 
* Images: fixed wrong second side image after localized images download (you must re-download KHM and ZNR sets to fix it);
 2021-02-11 09:15:55 +04:00
Oleg Agafonov
c9f4e949fa * Images: added more download stats (now you can see a progress of prepare stage); 2021-02-11 08:12:55 +04:00
Gabriel Sturtevant
3e8df481db Removed layout info 2021-02-09 16:28:25 -08:00
Gabriel Sturtevant
aa56bf22ce Added 2004 World Championship decks 2021-02-09 16:24:15 -08:00
Oleg Agafonov
ea577e2070 GUI: fixed booster tooltip in deck editor; 2021-02-08 19:38:57 +04:00
Oleg Agafonov
b2b88bf2e8 Improved card icons (fix ambiguous interpretation of vigilance, first and double strikes, #7471); 2021-02-07 23:11:35 +04:00
Oleg Agafonov
cf216c6802 Prepare new release 2021-02-07 22:24:40 +04:00
Oleg Agafonov
0eac8eb530
Merge pull request #7511 from spjspj/master 
Final line of jumpstart should be blank
 2021-02-07 01:14:17 +01:00
spjspj
6056a6adb4 Final line of jumpstart should be blank or final pack won't be added in to pool. Add a sample (the original jumpstart.txt) file for users to more easily modify if necessary. 2021-02-07 11:05:16 +11:00
Oleg Agafonov
03952ae0d6 [KHC] added tokens and download support; 2021-02-06 20:54:32 +04:00
Oleg Agafonov
f7bc745f10 [KHM] added tokens and download support; 2021-02-06 20:30:19 +04:00
Oleg Agafonov
abe65411b6 GUI: fixed errors in card viewer for some combinations of emblems and tokens, simplified draw code; 2021-02-06 20:28:54 +04:00
Oleg Agafonov
c256aa59f7 GUI: fixed error on closing dialogs/games (#7507); 2021-02-05 20:54:21 +04:00
spjspj
b64806606c Adding in Jumpstart Custom (requested fixes) 2021-02-06 00:19:36 +11:00
spjspj
1e428105d5 Adding in Jumpstart Custom 2021-02-04 23:55:59 +11:00
Oleg Agafonov
4b9de96a6b Test framework: added support to put mdf cards on battlefield by cheats or unit tests; 2021-02-03 14:23:50 +04:00
Oleg Agafonov
be77ecea84 GUI: fixed not working single and double clicks on the card's second side (draft, deck editor, see #7472); 2021-02-03 11:32:15 +04:00
Oleg Agafonov
3b7e01d687 GUI: fixed that the playable card mark is not displayed for the second side after day/night button click; 2021-02-03 11:30:24 +04:00
Oleg Agafonov
f5bb3a3b9a [KHC] added images download 2021-02-03 10:37:47 +04:00
Oleg Agafonov
5f2e06e1ff Game: improved wrong charset logs on startup 2021-02-03 10:30:34 +04:00
Oleg Agafonov
bc72384f0d * GUI: added cards and mana amount info to player's panel hint (example: move mouse over mana icons); 2021-02-02 04:43:49 +04:00
Oleg Agafonov
ebbff82f82
Merge pull request #7335 from ddzn/feature/eurolanderDecks 
Add new deck type European Highlander
 2021-01-31 20:06:00 +01:00
Oleg Agafonov
2fe2f05b60 GUI: added preferences settings for card icons (enable abilities icons and playable icon); 2021-01-30 17:34:10 +04:00
Oleg Agafonov
a1da5ef437 * GUI: new reworked GUI and card render engine, card icons and dozens of other fixes (see full list in related PR); 2021-01-30 16:38:55 +04:00
Evan Kranzler
dacf30f4b9
Refactoring subtypes to make Maskwood Nexus work (ready for review) (#7432) 
* removed and renamed SubTypeList

* updated subtype test

* refactored Changeling to be an ability that actually does something

* moved isAllCreatureTypes into SubTypes class

* renamed copyTo method to copyFrom

* added removeAllCreatureTypes where usable

* replaced some subtype methods

* replaced some more subtype methods

* replaced subtype mass add/remove methods

* updated more subtype methods

* fixed some errors

* made common shared creature type predicate

* refactored another card involving subtypes

* Added usage of object attribute in subTypes's write operations;

* Refactor: use same param styles in subtype methods

* Refactor: simplified usage of copy appliers;

* Refactor: fixed code usage in CopyApplier

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-01-26 08:52:35 -05:00
Jeff
c98329c822 - added 1998 WC deck Draw Go by Randy Buehler 2021-01-09 10:35:34 -06:00
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