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

8892 commits

Author SHA1 Message Date
Oleg Agafonov
394e88f041 Fixed class names 2020-09-07 00:25:45 +04:00
Oleg Agafonov
01c7ed3e70 [ZNR] fixed text and hint colors (#7047); 2020-09-07 00:22:26 +04:00
Evan Kranzler
f977decf6e [ZNR] Implemented Relic Robber 2020-09-06 15:06:35 -04:00
Evan Kranzler
579e341944 [ZNR] Implemented Coralhelm Chronicler 2020-09-04 16:26:42 -04:00
Evan Kranzler
88f6ea6ee9 [ZNR] Implemented Umara Mystic 2020-09-04 10:36:11 -04:00
Evan Kranzler
d4ca4553d1 fixed a few recursion issues with party count computations 2020-09-03 20:44:24 -04:00
Evan Kranzler
cc0bb84dad
[ZNR] Implemented party mechanic (#7036) 
* added incomplete party count implementation

* updated party count implementation

* added party count test

* fixed tests, updated test framework

* added an additional test

* fixed some errors in party count computation, should be good now

* fixed a small error with test generation

* fixed an NPE issue
 2020-09-03 19:22:05 -04:00
Evan Kranzler
84609b74e0 fixed some errors in party count computation, should be good now 2020-09-03 18:25:59 -04:00
Oleg Agafonov
535e49b89f Test framework: added aliases support for activated abilities (related to #7036); 2020-09-04 02:18:40 +04:00
Oleg Agafonov
7a1795660a Fixed missing copy fields in CardImpl (morph, modaldfc, art; related to rollback); 2020-09-04 01:29:31 +04:00
Evan Kranzler
e254371f91 updated party count implementation 2020-09-03 16:34:15 -04:00
Evan Kranzler
42e38a4e8a some more changes to modal DFC implementation 2020-09-03 14:06:11 -04:00
Evan Kranzler
db11e2d92e Update CardsInOpponentGraveCondition.java 2020-09-03 13:02:19 -04:00
Evan Kranzler
b54c9449ef [ZNR] Implemented Mind Carver 2020-09-03 10:08:13 -04:00
Evan Kranzler
f9f845cb44 [ZNR] Implemented Prowling Felidar 2020-09-02 15:54:49 -04:00
Evan Kranzler
025a3edf9f [ZNR] Implemented Archpriest of Iona 2020-09-01 22:30:01 -04:00
Evan Kranzler
3a1239ba38 [ZNR] Implemented Spoils of Adventure 2020-09-01 19:49:43 -04:00
Evan Kranzler
73d37f0b70 added incomplete party count implementation 2020-09-01 17:36:40 -04:00
Evan Kranzler
b4c2898b39 [ZNR] Implemented Shepherd of Heroes 2020-09-01 17:30:48 -04:00
jeffwadsworth
34cece1107 - Fixed #7033 2020-08-31 15:38:46 -05:00
LevelX2
61315ec741 * Improved some FixedTarget initializations. 2020-08-31 10:54:59 +02:00
LevelX2
50668a548f * FixedTarget - Added check for missing init of zoneChangeCounter on use of getFirstTargetPermanentOrLKI (this fixes the problem with missing counter for Pelt Collector). 2020-08-31 10:54:08 +02:00
Oleg Agafonov
5a5c7f6224
Merge pull request #6998 from magefree/dependabot/maven/com.github.os72-protoc-jar-maven-plugin-3.11.4 
Bump protoc-jar-maven-plugin from 3.6.0.1 to 3.11.4
 2020-08-31 09:31:20 +02:00
LevelX2
bbf30c6f74
Merge pull request #7026 from acabaca24/branch-for-issue6643 
Duplicated code in "return to its owner's hand" effect
 2020-08-31 09:18:10 +02:00
André Cabaça
7926c7c7d7
Missing 's' in effect 
In the line 'sb.append(" to their owners' hand");' changed "hand" to "hands".
 2020-08-31 00:56:30 +01:00
Andre Cabaca
36a3008f4c Optimized "Return to hand" effect text 
Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-30 12:49:24 +01:00
Andre Cabaca
0f6b8bbe9e Fixing an issue with the "return to its owner's hand" that was duplicating the target text. 
Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-30 11:54:13 +01:00
Oleg Agafonov
0cad4acf31
Merge pull request #7017 from acabaca24/branch-for-issue6643 
Correcting some M21 text issues
 2020-08-29 21:34:59 +02:00
Oleg Agafonov
29242ec759 * Monarch designations - improved effects stability after game rollback or in AI games; 2020-08-29 21:21:13 +04:00
Oleg Agafonov
e1c7943636 * God-Eternal dies abilities - fixed rollback error in rare cases 2020-08-29 21:17:06 +04:00
Oleg Agafonov
87d8383eb8 * Undercity Reaches - fixed rollback error on plane's draw trigger 2020-08-29 20:40:02 +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
LevelX2
cd5c1c282c * Angel of Jubilation - Fixed possible Null Pointer Exception in Player.canPayLifeCost method (fixed #7019). 2020-08-28 09:26:38 +02:00
Andre Cabaca
c069cf4235 Fixed Caged Zombie in issue #6643 
Fixed also cards with the same condition in an activated ability like Skirsdag High Priest

Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-27 20:23:41 +01:00
Andre Cabaca
219cfdc583 Fixed BarrinTolarianArchmage oracle in #6643 
Fixed all the "return up to one (...) to **their** owners and" to "return up to one (...) to **its** owners and" found in cards like Teferi Time Raveler or Barrin Tolarian Archmage

Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-27 20:23:39 +01:00
Evan Kranzler
f4da18df89 [ZNR] Implemented Nahiri, Heir of the Ancients 2020-08-27 12:07:43 -04:00
LevelX2
e32396bbb6
Merge pull request #6991 from acabaca24/equipped_creature_dies_errata 
Changed description of "when equipped creature dies"
 2020-08-27 08:50:05 +02:00
Evan Kranzler
f1272ee8ac fixed a few more errors 2020-08-26 19:28:12 -04:00
Evan Kranzler
cc84efa017 fixed an error 2020-08-26 18:57:35 -04:00
Evan Kranzler
6903dad861 Implemented Jace, Mirror Mage 2020-08-26 18:48:59 -04:00
Oleg Agafonov
8ce5c7f907 Fixed NPE on game.getState() usage 2020-08-26 13:34:08 +04:00
Oleg Agafonov
cf5b474c29 Fixed NPE on playersList usage 2020-08-25 23:41:41 +04:00
Oleg Agafonov
6fa4c0b8f2 Fixed NPE on playerList.getNext usage 2020-08-25 23:38:51 +04:00
LevelX2
f1d2d2fb22 * Safe Passage - Fixed a problem that damage to player was not prevented (fixes #6995). 2020-08-25 16:30:48 +02:00
LevelX2
6b4336a00a * Fixed some tooltip rule texts. 2020-08-24 22:45:54 +02:00
LevelX2
bd413d2749 * Workaround for StackOverflowError #6994. Don't know yet why the loop happens - why the LookAtTopCardOfLibraryAnyTimeEffect is called during mana calculation.. 2020-08-24 16:53:08 +02:00
LevelX2
dc45aaf02c * Fixed possible null pointer exception. 2020-08-24 16:50:29 +02:00
LevelX2
234fabb81e * Fixed that frame color of lands is set again to their mana colors in non game contect like editor. 2020-08-24 14:15:36 +02:00
dependabot[bot]
d1ace6df07
Bump protoc-jar-maven-plugin from 3.6.0.1 to 3.11.4 
Bumps [protoc-jar-maven-plugin](https://github.com/os72/protoc-jar-maven-plugin) from 3.6.0.1 to 3.11.4.
- [Release notes](https://github.com/os72/protoc-jar-maven-plugin/releases)
- [Changelog](https://github.com/os72/protoc-jar-maven-plugin/blob/master/RELEASE_NOTES.md)
- [Commits](https://github.com/os72/protoc-jar-maven-plugin/compare/v3.6.0.1...v3.11.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-24 06:35:01 +00:00
LevelX2
b7d86a71da * Made choose a card name choices mandatory (not selecting a name could cause null pointer exceptions e.g. Meddling Mage). 2020-08-23 12:14:13 +02:00
Oleg Agafonov
920697d2e5 Prepare new release 2020-08-23 01:52:55 +04:00
Oleg Agafonov
4e174e25be Merge fix 2020-08-22 19:21:25 +04:00
Oleg Agafonov
1b430e5d99 Added verify test to check missing second face cards in sets, fixed missing cards; 2020-08-22 18:48:15 +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
Oleg Agafonov
b083dd48e6 Fixed wrong card numbers, names and missing reprints in sets 2020-08-22 15:03:40 +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
90c6637dc2 * Implemeented consumable flag for asThoughtEffects and a player choice which effect to use if multiple consumable effects allow the same action. 2020-08-21 21:24:42 +02:00
Andre Cabaca
90cc44cacf Changed DiesAttachedTriggeredAbility.java to check if description has "equipped", if so, writes "Whenever" instead of "When" 
resolves#6990
and fixes Malefic Scythe in #6643

Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-21 17:23:39 +01:00
LevelX2
8105d8b26c * Improved handling of asThoughtAs approval by abilities that allows a clear and easy assignment of the approving effect. 2020-08-21 14:58:22 +02:00
LevelX2
783239e79e * Aminatou's Augury - Fixed that spells in exile where not shown as castable and that AI usage prevented casting of multiple spells from exile (fixes #6987). 2020-08-20 16:48:13 +02:00
LevelX2
22e6fee101 * Fixed a bug that non permanent cards could be moved to battlefield instead of staying in the zone they are. 2020-08-18 19:02:15 +02:00
LevelX2
c19af65431 * Added calculation of mana sources of hand cards (related to #6698). 2020-08-18 14:52:26 +02:00
LevelX2
818952bf2d * Fixed a bug that prevented to show cards as playable if castable by alternateSourceCosts (fixes Dream Halls problem related to #6698). 2020-08-18 14:00:06 +02:00
LevelX2
c48331f216 * Doubling Cube - Added support for possible mana calculation (related to #6698). 2020-08-18 00:22:53 +02:00
Oleg Agafonov
27db13605e Reverted broken h2database dependency version (error on existed databases: Unsupported type 17) 2020-08-18 00:44:44 +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
a4af5501f9 * If you control a commander - added card hints; 2020-08-17 04:03:54 +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
LevelX2
768f1bec4f * Fixed available mana calculation for Cryptic Trilobite and Titans' Nest. Added some improvements for available mana calculation of conditional mana. 2020-08-16 01:16:52 +02:00
Erik
3d989b24ac
Text corrections from issue #6654 (WIP) (#6707) 
* Collective restraint typo fix

* set text for EndlessSwarm. Add starts with vowel cond case to CountersSourceEffect

* Teferi's Curse, added text option to GainAbilityAttachEffect

* added set text to several cards. Implement reviewer suggestions in GainAbilityAttachedEffect

* Remove period from rule text (undo my lazy coding fix)
 2020-08-16 00:55:59 +04:00
Thomas Winwood
81e348360c Fix a bunch of card text errors (magefree#6643) 2020-08-15 23:56:53 +04:00
Oleg Agafonov
583f9957f4
Merge pull request #6932 from magefree/dependabot/maven/com.h2database-h2-1.4.200 
Bump h2 from 1.4.197 to 1.4.200
 2020-08-15 21:17:47 +02:00
Evan Kranzler
8240e956dc updated historic legality implementation 2020-08-15 14:03:11 -04:00
htrajan
6bfa212bf3 add Amonkhet Remastered 2020-08-15 00:27:09 -07:00
Oleg Agafonov
d8c9d10066 * Do if cost paid - fixed that some cards asks player about pay two times (fixed ~30 cards); 2020-08-14 16:36:00 +04:00
Oleg Agafonov
61bfdf8108 Tests: added verify check for wrong optional settings on DoIfCostPaid usage; 2020-08-14 16:22:34 +04:00
Oleg Agafonov
9dc3d514bd * Do if cost paid - added logs message if the player decided to pay the cost; 2020-08-14 15:57:47 +04:00
LevelX2
27b5c920f7 * Offering - Fixed handling of hybrid mana in casting costs of offered creatures (fixes #6961). 2020-08-14 10:25:47 +02:00
jeffwadsworth
0cda2d9635 - Fixed #6889 2020-08-13 16:35:24 -05:00
jeffwadsworth
f795e7649f - Fixed #6959 2020-08-12 17:09:07 -05:00
LevelX2
cc684ad6bb Merge origin/master 2020-08-12 16:26:52 +02:00
LevelX2
3e498e23e6 * Offering ability - Fixed use in available mana calculation (related to #6698). 2020-08-12 16:26:22 +02:00
jeffwadsworth
79592d2b0a - Fixed #6861 2020-08-12 09:24:40 -05:00
LevelX2
6a65e5bb23 * Mana Clash - Fixed use in available mana calculation (related to #6698). 2020-08-12 13:58:06 +02:00
jeffwadsworth
36468044f4 - Fixed #6946 2020-08-11 21:56:49 -05:00
jeffwadsworth
f0149c6a19 - Added Pretender's Claim and Unnatural Hunger 2020-08-11 18:13:30 -05:00
jeffwadsworth
3d0cd99655 - Refactor EnchantedCreatureBlockedTriggeredAbility to BecomesBlockedAttachedTriggeredAbility 2020-08-11 08:26:47 -05:00
jeffwadsworth
d3ba7d4dd5 - Added Righteous Indignation and Insubordination 2020-08-10 17:13:00 -05:00
LevelX2
9abbdae032 Merge origin/master 2020-08-10 21:12:34 +02:00
LevelX2
973c19c81f * Fixed possible game exception with empty library and commander movement (fixes #6952). 2020-08-10 21:12:12 +02:00
jeffwadsworth
3b90c48c75 - Refactored BlocksTriggeredAbility to BlocksSourceTriggeredAbility 2020-08-10 11:49:03 -05:00
LevelX2
12c50420bf * Fixed possible game exception with empty library and commander movement (fixes #6952). 2020-08-10 17:25:48 +02:00
Oleg Agafonov
b16d30b79b
Merge pull request #6190 from luziferius/refactor_promo_sets 
[RFC] Refactor promo sets, add missing sets as listed on Scryfall
 2020-08-10 16:57:00 +02:00
Oleg Agafonov
ad6797d3c0 GUI: added more error checks while import/load deck file; 2020-08-08 23:12:06 +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
66a8994318 Tests: added sets implementation statistics in test_checkMissingSets 2020-08-08 14:02:28 +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
LevelX2
fcf27e55d6 * Archetype cards - Fixed layer to interact correctly with ability adding/removing continuous effects. 2020-08-07 22:52:45 +02:00
jeffwadsworth
2abeb43449 - Added Port Inspector and Robber Fly 2020-08-07 15:36:43 -05:00
LevelX2
457557852e * Benthic Explorer - Fixed mana type calculation. 
* DynamicManaEffect - Fixed mana type calculation.
Some code clean up.
 2020-08-07 17:15:06 +02:00
LevelX2
66d5b915db * Some code clean up. 2020-08-07 15:08:19 +02:00
Oleg Agafonov
9e6a348cb1
Merge branch 'master' into refactor_promo_sets 2020-08-07 02:48:40 +02:00
jeffwadsworth
bfa54c3418 - Fixed #6872. ¯\_(ツ)_/¯ 2020-08-06 16:06:48 -05:00
Oleg Agafonov
83f7ae377a Refactored restore state code, added additional error check for mana undo param; 2020-08-06 22:17:37 +04:00
Oleg Agafonov
2eeefd91ef Added additional test for prevent damage effects, improved 3358e2da80 (#6915) 2020-08-06 21:16:59 +04:00
jeffwadsworth
bfbb76fcf1 - Fixed #6935 2020-08-04 14:55:25 -05:00
jeffwadsworth
c3de6bf8a0 - Fixed #6919. Fixed other cards with the same issue. 2020-08-04 14:15:50 -05:00
Oleg Agafonov
2a7ac3fc9e Additional to #6937 2020-08-04 22:39:12 +04:00
Oleg Agafonov
bb148c9cb5 * Special mana abilities: fixed that it can be used to skip card's mana payments (#6937); 2020-08-04 22:09:57 +04:00
Oleg Agafonov
3430013f8d * Server: fixed that too much permanents or mana sources on battlefield can crush or slow down the server (#6938); 2020-08-04 05:36:43 +04:00
LevelX2
985d4205bf * Harvest Mage - Fixed available mana generation (#6698). 2020-08-03 21:26:47 +02:00
LevelX2
244cf2a1e9 * K'rrik, Son of Yawgmoth - Fixe phyrexian mana like payment of mana costs (closes #6928 related to #6698). 2020-08-03 19:17:07 +02:00
dependabot[bot]
8435c6579a
Bump h2 from 1.4.197 to 1.4.200 
Bumps [h2](https://github.com/h2database/h2database) from 1.4.197 to 1.4.200.
- [Release notes](https://github.com/h2database/h2database/releases)
- [Commits](https://github.com/h2database/h2database/compare/version-1.4.197...version-1.4.200)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 07:21:00 +00:00
LevelX2
cbc1c02cde * Fixed bug that caused some tests to fail introduced with 67dd45c1c7. 2020-08-03 08:32:26 +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
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
LevelX2
516a4104f1 * Treasonous Ogre - Fixed available mana generation (#6698). 2020-08-02 11:34:19 +02:00
LevelX2
67dd45c1c7 * Added getProducableManaTypes method for mana effects to handle Squandered Resources or Reflecting Pool like abilities. 
* Fixes to Soldevi Adnate, Skirge Familiar, Mana Web.
 2020-08-02 10:51:22 +02:00
jeffwadsworth
121e1043ab - RegenerateSourceEffect() will now be discarded if the source permanent is blinked or changes zone. 2020-08-01 16:12:58 -05:00
jeffwadsworth
2a35f833a7 - RegenerateSourceEffect() will now be discarded if the source permanent is blinked or changes zone. 2020-08-01 16:11:55 -05:00
Oleg Agafonov
c7595ca476 * Regeneration abilities - added card hint about activated and used regeneration; 2020-08-01 21:29:08 +04:00
Oleg Agafonov
4ba7c18d43 * Discard cost - added hint text in card choose dialog about discard; 2020-08-01 21:07:37 +04:00
LevelX2
c343767e8e * Fixed available mana generation of Jungle Patrol (was no mana ability) and Priest of Yawgmoth (#6698). 2020-07-31 13:53:07 +02:00
LevelX2
06968ad921 * Fixed a problem of available mana generation caused by order of usage of mana sourced with costs (example Coal Golem and then Dromar's Attendant - related to #6698). 2020-07-30 23:37:04 +02:00
Oleg Agafonov
8e929d4e9d Fixed not working cost modification effects in get playable calcs from some cards (#6684): 
* Kasmina, Enigmatic Mentor
* Kopala, Warden of Waves
* Monastery Siege
* Senator Lott Dod
* Terror of the Peaks
 2020-07-30 22:06:12 +04:00
Oleg Agafonov
0824d2901a * Transform abilities - fixed duplicated triggered abilities from transformed permanents; 
* Accursed Witch // Infectious Curse - fixed wrong cost modification effect (#6684);
 2020-07-30 12:13:32 +04:00
LevelX2
7cfe39ae21 * Fixed that not all Equip abilities were correctly identified for abilities that changed Equip timig (e.g. Leonin Shikari - fixes #6907). 2020-07-29 16:16:47 +02:00
LevelX2
ffa837ae95 * Angel of Jubilation - Fixed that it did not only prevent life payment from casting spells or activating abilities (fixes #3663). 2020-07-29 14:48:14 +02:00
LevelX2
307d4a6283 Merge origin/master 2020-07-28 16:31:46 +02:00
LevelX2
9903944804 * Reworked retrieving spell characteristics (related to 98ebcc07ca). 2020-07-28 16:29:44 +02:00
Oleg Agafonov
a5a5256cff Code cleanup 2020-07-28 18:15:32 +04:00
LevelX2
0458778c44 * Fixed bug of Druids Repository (related to b5c93cf2da), 2020-07-28 13:28:24 +02:00
Oleg Agafonov
fdc32f891e * Raid abilities - added card hints about raid condition, fixed missing ability words; 2020-07-28 04:25:43 +04:00
LevelX2
b5c93cf2da * Fixed available mana generation of Druids Repository, Workhouse, Iceberg, Krak Clan Ironworks, Rasputin Dreamweaver and Sirk Prospector (#6698). 2020-07-28 01:03:33 +02:00
LevelX2
82a9726a35 * Fixed available mana generation of Virdian Joiner (#6698). 2020-07-27 23:50:07 +02:00
LevelX2
82dfd76ee3 * Fervent Champion - Fixed that it's possible to equip the Champion also without having the regular mana (#6698). 2020-07-27 22:27:11 +02:00
LevelX2
6e68e038b6 * Bartered Cow - Fixed that it does nothing when discarded (fixes #6884). 2020-07-27 21:47:31 +02:00
Oleg Agafonov
96155ec799 Cheat engine: fixed that it doesn't init effects and other staff from battlefield permanents (#6888); 2020-07-27 20:46:21 +04:00
dependabot[bot]
cc66aeeb9b
Bump protobuf-java from 3.7.0-rc1 to 4.0.0-rc-2 
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.7.0-rc1 to 4.0.0-rc-2.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.7.0rc1...v4.0.0-rc2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:07 +00:00
LevelX2
7a78be8c6a * Some target pointer changes and code clean up. 2020-07-26 00:16:14 +02:00
LevelX2
85d18899b1 * Fixed a problem that conditional mana could not be correctly used with AsThoughEffects (fixes #6880). 2020-07-25 22:11:30 +02:00
Oleg Agafonov
3abe5e796a Server: removed unnecessary logs, extra comments 2020-07-25 19:06:38 +04:00
Oleg Agafonov
848c5b6052 Fixed missing watchers from DelayedTriggeredAbility: 
* Planeswalkers Mischief - fixed rollback error on play;
* Psychic Theft - fixed rollback error on play;
 2020-07-25 19:01:49 +04:00
Oleg Agafonov
32b7c592c8 * Sanguine Indulgence - fixed rollback error on play, fixed card text (#6643); 2020-07-25 17:26:10 +04:00
Oleg Agafonov
043785b1d1 * Metalcraft abilities - added card hints about artifacts count, fixed missing ability word; 2020-07-25 05:40:59 +04:00
Oleg Agafonov
97c427375d Fixed face down cost modification (related to 653a2dd7b2) 2020-07-24 21:30:03 +04:00
LevelX2
4d43914673 * Morselhoarder - Fixed calculation of available mana and some cleanup to other mana abilities (#6698). 2020-07-24 16:41:36 +02:00
LevelX2
98ebcc07ca * Fixed spell cost reduction for bestow not working during calculation of castable spells (#6698). 2020-07-24 16:04:52 +02:00
LevelX2
653a2dd7b2 * Available mana calculation - Fixed a problem with repeatable mana converting abilities (e.g. Farrelite Priest) that were only considered once (#6698). 2020-07-24 12:06:14 +02:00
LevelX2
329352f36b Hunters' Feast - Fixed rule text (fixes #6878). 2020-07-23 12:22:07 +02:00
LevelX2
b965bddf92 * Oathbreaker: Signature spell did not return to command zone if exiled (fixes #6870). 2020-07-21 23:46:55 +02:00
LevelX2
d721c0bea3 * Commander state-based action -Fixed that commander movement did not always work correctly after rollback (#6866). 2020-07-20 22:22:20 +02:00
LevelX2
5cb950e53f * Basri's Lieutenant - Fixed that it created also the token if Lieutenant dies without a +1/+1 token (fixes #6863). 2020-07-20 10:35:36 +02:00
jeffwadsworth
048ce3f2a7 - Fixed #6326 2020-07-18 11:01:53 -05:00
bubba
c84a913858 - Fixed #6326 2020-07-18 11:01:03 -05:00
LevelX2
5decfa3964 * Traumatize, Bond of Insights, Enter The God-Etrenals and Flint Golem - Changed to mill method. 2020-07-18 17:27:15 +02:00
LevelX2
ba31b956dc * Meld Keyword - Fixed that the melt status was not correctly handled related to rollbacks or AI game simulation (fixes #6723). 2020-07-18 16:33:28 +02:00
LevelX2
a2ae232b43 * Fixed some corner cases for Worl Enchantment State-Based actions (704.5k). 2020-07-18 12:23:19 +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
LevelX2
621d8c188d * Reworked rollback handling - possible fix for #2072 #5383, #4309 and fixes #5883, fixes #1983, fixes #5917. 2020-07-17 17:42:49 +02:00
LevelX2
e4ae2f3fec * Fixed Rollback UI bug with ManaPool's autoPayment and autoPaymentRestricted (fixes #5002). 2020-07-16 23:56:43 +02:00
LevelX2
23087e6c23 * Used ManaOptions to calculate possible mana combinations (related to comment of 7ad7d5f03d). 2020-07-16 22:56:33 +02:00
LevelX2
3a82840e66 * Fixed some more available mana calculation problems. Mana of the pool is now taken into account (e.g. Coal Golem problem). Crucible of the Spirit Dragon - Conditional mana curretnly not handled correctly in available mana calculation. Crystalline Crawler works now.Related to #6698. 2020-07-16 22:37:51 +02:00
18ths
ddf007e6f1 Removed redundant Living End effect. Fixes #6385 2020-07-16 16:56:12 +02:00
LevelX2
7ad7d5f03d * Fixed available mana generation for Caged Sun and storage lands (e.g. Calciform Pools) related to #6698. 2020-07-16 12:44:01 +02:00
LevelX2
b0cd69bb08 * Fixed missing imports of aad36dda19 commit. 2020-07-15 00:48:19 +02:00
LevelX2
083c4bc5d4 * Reworked some card movement to player methods (#4866). 2020-07-15 00:42:08 +02:00
LevelX2
aad36dda19 * Fixed possible problem with setting of the spellAbility during card copies (related to eecaa232f5). 2020-07-14 23:18:47 +02:00
LevelX2
24098bf8cc Merge origin/master 2020-07-14 23:06:35 +02:00
LevelX2
49ab4e0992 * Fixed possible problem with setting of the spellAbility during card copies (related to eecaa232f5). 2020-07-14 23:06:03 +02:00
jeffwadsworth
bfb7a1a24d - Fixed #6838 2020-07-14 15:49:30 -05:00
LevelX2
eecaa232f5 * Fixed a problem where for copies of cards/permanent the included spell ability was not correctly copied and the copied card had the spell ability twice. That could cause in some rare cases problems with spell ids of copies (this fixes #6824) or did allow on the other side some unproper handling of things (Animate Dead). 2020-07-14 21:28:45 +02:00
jeffwadsworth
2e0be17494 - small Refactor 2020-07-14 08:20:31 -05:00
jeffwadsworth
335acd4375 - Fixed #6832 2020-07-13 23:32:18 -05:00
jeffwadsworth
8818a12b6e - Fixed #6834 2020-07-13 16:54:08 -05:00
jeffwadsworth
a7b2c81db6 - Fixed #6834 2020-07-13 15:51:17 -05:00
LevelX2
f3fafbdb14 * Fixed that choose opponent was handled targeted but shouldn't (e.g.used for Stalking Leonin) fixed #6836. 2020-07-13 17:13:30 +02:00
Oleg Agafonov
362352954b
Merge pull request #6830 from magefree/Add-historic2 
Add Historic format and Historic Anthologies
 2020-07-13 15:37:52 +02:00
LevelX2
c6c1b0ed3a * Fixed a bug that by countering a copied spell (e.g. by copied Memory Lapse), the copy could be removed from stack instead the originally countered spell (fixes #6823). 2020-07-13 11:23:36 +02:00
LevelX2
1cdb715d92 * Fixed a problem how the color of mana paid from mana pool was recognized that could made problems to count the number of different colors used to pay a spell with convergence (e.g. if the mana was created with Cascading Cataracts) fixes #3816. 2020-07-13 00:10:09 +02:00
LevelX2
49d94cb84f * Crystalline Resonance - fixed that the duration of the copy effect erroneously didn't end on the next turn of the controller (fixes #6825). 2020-07-12 09:25:34 +02:00
LevelX2
31163eec6d * Fixed that mana sources that produce any mana type that other sources produce (e.g. Reflecting Pool) could erroneously produce colorless mana from mana sources that could only produce any color mana (fixes #6814). 2020-07-12 08:50:56 +02:00
Oleg Agafonov
219ab89bcc Fixed test 2020-07-11 21:03:32 +04:00
LevelX2
81e5650972 * Fixed calcultion of available mana for Goblin Clearcutter, Seton Krosan Protector, Urza, Lord High Artificer, Heritage Druid, Birchlore Ranger and Grand architect. 2020-07-11 16:43:38 +02:00
mikalinn777
bf293ca939 Add Historic format and Historic Anthologies 2020-07-11 12:06:01 +02:00
LevelX2
89249888b5 * Added handling of triggered mana to available mana calculation (fixes #585). 2020-07-11 00:53:47 +02:00
Oleg Agafonov
1cf57e0840 Fixed that AI can't play games in Jumptstart tourneys 2020-07-10 17:40:59 +04:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +04:00
Oleg Agafonov
06b6e482a0 * Exile and return to battlefield - fixed that some cards can return commander from command zone but they shouldn't (example: Cloudshift, Conjurer's Closet, see #5151, #5278); 2020-07-10 14:37:46 +04:00
LevelX2
40b7d723ef * Some minor code clean up and a test. 2020-07-10 09:06:25 +02:00
arcox
9c7982e8f6 Update *.sh and *.java files to use Unix line endings 2020-07-09 13:07:26 -04:00
jeffwadsworth
a6d03c925f - Fixed #6806 2020-07-09 11:10:28 -05:00
Oleg Agafonov
cb3757d0db
Merge pull request #6795 from magefree/dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0 
Bump build-helper-maven-plugin from 1.12 to 3.2.0
 2020-07-09 01:38:49 +02:00
Oleg Agafonov
6c3162f140 Optimized sql for deck editor 2020-07-09 03:08:44 +04:00
Oleg Agafonov
99ceeb5076 Tokens improves: 
* [M21] added tokens;
 * [M21] added tokens download support;
 * Fixed wrong images for some tokens (Angel, Beast, Bird, Cat, etc);
 2020-07-09 02:38:37 +04:00
18ths
13f7f2a035 Revert "removed some of unused dependencies" 
This reverts commit d6ad722266.
 2020-07-08 17:16:16 +02:00
18ths
d6ad722266 removed some of unused dependencies 2020-07-07 20:11:45 +02:00