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

35201 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jeff
f35ca8112c Merge branch 'master' of https://github.com/magefree/mage 2021-08-28 15:41:20 -05:00
jeff@delmarus.com
5a87664a55 - Fixed #8166 2021-08-28 15:40:46 -05:00
Evan Kranzler
91e114e501 [AFR] enabled collation 2021-08-28 16:02:23 -04:00
Evan Kranzler
3ce3adfe1d [AFR] added all printings 2021-08-28 16:01:46 -04:00
Raphael-Schulz
f03a410b9e
[AFR] Implemented Xanathar, Guild Kingpin (#8045) 
* [AFR] Implemented Xanathar, Guild Kingpin

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-08-28 23:55:41 +04:00
Oleg Agafonov
65761b085f * Game: fixed wrong booster pass order in drafts (#8075); 2021-08-28 13:17:57 +04:00
Oleg Agafonov
2efdb464fc Little refactor, additional logs for CheckPlayableState error; 2021-08-28 12:09:22 +04:00
Oleg Agafonov
7b298f84a7 Fixed comment 2021-08-28 11:34:40 +04:00
jeffwadsworth
b6acaed99d Merge branch 'master' of https://github.com/magefree/mage 2021-08-27 15:17:42 -05:00
jeffwadsworth
40a2f9490d - Fixed #8162 2021-08-27 15:16:59 -05:00
Oleg Agafonov
91d577b0af Test framework: fixed that ai play step command doesn't work correctly on declare attackers and blockers steps; 2021-08-27 21:43:44 +04:00
Oleg Agafonov
8a3f34df29
Merge pull request #8151 from magefree/dependabot/maven/Mage.Client/org.jsoup-jsoup-1.14.2 
Bump jsoup from 1.13.1 to 1.14.2 in /Mage.Client
 2021-08-27 21:08:06 +04:00
dependabot[bot]
d2318fb408
Bump shiro-core from 1.6.0 to 1.8.0 
Bumps [shiro-core](https://github.com/apache/shiro) from 1.6.0 to 1.8.0.
- [Release notes](https://github.com/apache/shiro/releases)
- [Changelog](https://github.com/apache/shiro/blob/main/RELEASE-NOTES)
- [Commits](https://github.com/apache/shiro/compare/shiro-root-1.6.0...shiro-root-1.8.0)

---
updated-dependencies:
- dependency-name: org.apache.shiro:shiro-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 16:52:55 +00:00
Oleg Agafonov
d481172eb4 Code: added test coverage reports by JaCoCo lib (generate by command like "mvn install -Djacoco.skip=false"); 
Code: added test coverage support for Sonar reports;
 2021-08-27 20:51:42 +04:00
Evan Kranzler
389a019b3b fixed a verify failure 2021-08-27 09:36:08 -04:00
Evan Kranzler
bbcccf4b58 [AFC] Implemented Galea, Kindler of Hope 2021-08-27 09:08:20 -04:00
Evan Kranzler
e9f3766210 [AFC] Implemented Grave Endeavor 2021-08-26 09:49:41 -04:00
Evan Kranzler
e49f606e5a [SLD] added newest drops 2021-08-26 09:36:40 -04:00
Evan Kranzler
418f61e5d9 [AFC] a few changes to Valiant Endeavor and Wild Endeavor 2021-08-26 06:38:49 -04:00
Joseph Zeffiro
c25d794367
[AFC] Implemented Wild Endeavor (#8028) 
* [AFC] Implemented Wild Endeavor

* cleanup

* Adding my missed author tags

* matching existing implementation
 2021-08-26 06:30:55 -04:00
Joseph Zeffiro
5e08c5d279
[AFC] Implemented Valiant Endeavor (#8035) 
* [AFC] implemented Valiant Endeavor

* matching existing implementation
 2021-08-26 06:30:34 -04:00
Evan Kranzler
f8d030bef4
Adding dice rolling trigger/replacement (ready for review) (#7989) 
* [AFR] Implemented DiceRolledTriggeredAbility
* [AFR] Implemented Brazen Dwarf
* [AFR] Implemented Feywild Trickster
* [AFC] Implemented Reckless Endeavor
* [AFR] Implemented Pixie Guide
* [AFR] Implemented Critical Hit
* [AFR] Implemented Netherese Puzzle Ward
* [AFC] Implemented Neverwinter Hydra
* [AFR] Implemented Farideh, Devil's Chosen
* [AFR] Implemented Barbarian Class
* [AFC] Implemented Vrondiss, Rage of Ancients
* [AFC] Implemented Arcane Endeavor
* Test framework: added planar die rolls support
* Test framework: added random results set up support in AI simulated games;
* AI: improved roll die results chooses in computer games;
* Roll die: improved combo support for planar die and roll die effects;

Co-authored-by: Daniel Bomar <dbdaniel42@gmail.com>
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-08-26 14:06:10 +04:00
Evan Kranzler
12219cff01 [AFC] Implemented Mantle of the Ancients 2021-08-25 08:11:54 -04:00
Grath
40cf802d6b
Fix Shockmaw Dragon's damage trigger (#8155) 
* Fix Shockmaw Dragon's damage trigger

The previous implementation was very wrong. This implementation is copied from Balefire Dragon's, except dealing one damage rather than the same amount as the damage dealt to the player.

* Update ShockmawDragon.java

Fix imports.
 2021-08-25 07:17:46 -04:00
Evan Kranzler
c1d6309db9 [AFC] Implemented Holy Avenger 2021-08-24 18:16:32 -04:00
Evan Kranzler
29835786c3 updated a few card type methods for companions 2021-08-24 09:43:33 -04:00
Evan Kranzler
3dff1783ac [TSP] fixed Gauntlet of Power adding mana to the wrong mana pool (fixes #8154) 2021-08-24 08:24:08 -04:00
Evan Kranzler
002a7af6d0 fixed a test failure 2021-08-23 19:27:27 -04:00
Evan Kranzler
85dfa58e5d [AFR] more text fixes 2021-08-23 19:14:50 -04:00
Evan Kranzler
31a559be23 [AFC] more text fixes 2021-08-23 18:53:35 -04:00
Evan Kranzler
8fe0467893 reworked mana text generation to fit canonical symbol order 2021-08-23 18:32:21 -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
jeff@delmarus.com
b21d85826c - text fix Glimpse the Cosmos 2021-08-22 23:18:53 -05:00
jeff@delmarus.com
1aa20a0483 - outcome fix 2021-08-22 22:27:07 -05:00
Evan Kranzler
e68c7bfeda fixed a test failure 2021-08-22 22:05:05 -04:00
Evan Kranzler
2db0da8429 updated AttacksOrBlocksAttachedTriggeredAbility 2021-08-22 18:08:40 -04:00
Evan Kranzler
13949d8e3e [AFC] various text fixes 2021-08-22 17:56:22 -04:00
Evan Kranzler
01fefff1b9 [AFC] Implemented Phantom Steed 2021-08-22 10:23:42 -04:00
Ingmar Goudt
e10da89463 test for #7912 2021-08-22 14:35:17 +02:00
Ingmar Goudt
fed7c2b288 small Sonar fixes 2021-08-22 12:20:28 +02:00
Ingmar Goudt
167d66fdff fix invalid contains method in Hedonist Trove 2021-08-22 12:05:51 +02:00
Ingmar Goudt
271f7b812f fix #8097, 
the sacrifice target cost was optional, but SacrificeCost.canPay first checks if there are valid targets. In this scenario there were none, but the spell should still be playable
 2021-08-22 12:01:10 +02:00
Ingmar Goudt
6c837e733b fix PuppetConjurer to trigger only on controllers upkeep, fixes #8145 2021-08-22 10:57:57 +02:00
Jeff
28d9d64112 Merge branch 'master' of https://github.com/magefree/mage 2021-08-21 18:05:47 -05:00
jeff@delmarus.com
fdc24c20da - Fixed #8144. Text is the bane of my existence. I hope some kind soul can fix it on this card so I don't throw myself out a window. Pic will be attached. Card works fine, though. 2021-08-21 17:55:09 -05:00
Evan Kranzler
b1bbe96536 fixed an error 2021-08-21 17:13:03 -04:00
Evan Kranzler
5547d04938 [PCY] reworked Celestial Convergence 2021-08-21 16:51:22 -04:00