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

32266 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Agafonov
c17b0e88ae
Merge pull request #6893 from magefree/dependabot/maven/org.reflections-reflections-0.9.12 
Bump reflections from 0.9.11 to 0.9.12
 2020-07-27 11:20:41 +02:00
Oleg Agafonov
b46f3a1754
Merge pull request #6891 from magefree/dependabot/maven/org.glassfish.jaxb-jaxb-runtime-2.3.3 
Bump jaxb-runtime from 2.3.2 to 2.3.3
 2020-07-27 11:06:27 +02: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
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
dependabot[bot]
21d4a4b6a8
Bump reflections from 0.9.11 to 0.9.12 
Bumps [reflections](https://github.com/ronmamo/reflections) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/ronmamo/reflections/releases)
- [Commits](https://github.com/ronmamo/reflections/compare/0.9.11...0.9.12)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:03 +00:00
dependabot[bot]
402ef6c232
Bump jaxb-runtime from 2.3.2 to 2.3.3 
Bumps jaxb-runtime from 2.3.2 to 2.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:43:58 +00:00
Ingmar Goudt
134bb63185 add m21 tests for B 2020-07-26 12:32:21 +02:00
LevelX2
7a78be8c6a * Some target pointer changes and code clean up. 2020-07-26 00:16:14 +02:00
Ingmar Goudt
142681c354 new m21 tests 2020-07-25 23:49:58 +02:00
Ingmar Goudt
ffb649b414 Merge branch 'master' of https://github.com/magefree/mage 2020-07-25 22:22:07 +02:00
Ingmar Goudt
40f73375da add comments, strictmode and assertAllCommandsUsed to m21 tests 2020-07-25 22:21:53 +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
jeffwadsworth
202e25208e - Fixed text Feedback. 2020-07-25 10:11:42 -05: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
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
ingmargoudt
939bdc292c
Merge pull request #6886 from magefree/m21_test 
M21 test
 2020-07-25 12:49:29 +02:00
Ingmar Goudt
41b7439403 Merge remote-tracking branch 'origin/master' into m21_test 2020-07-25 12:38:33 +02:00
Ingmar Goudt
9e7efc8da3 some m21 tests 2020-07-25 12:37:58 +02:00
Oleg Agafonov
06e22a211d * Alpine Houndmaster - fixed that it boost until attack ends instead until end turn, fixed text (#6643); 2020-07-25 13:48:31 +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
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
Oleg Agafonov
dfaf09e76c * Hamletback Goliath - fixed rollback error (#6882); 2020-07-24 20:02:15 +04:00
Oleg Agafonov
1d9d59a8a5
Merge pull request #6883 from senft/master 
Fix FilterCard name of TrinketMage
 2020-07-24 17:53:39 +02:00
senft
855e09810a Fix FilterCard name of TrinketMage 
The cardinality is added via the TargetCardInLibrary.
 2020-07-24 17:46:52 +02: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
a90dbd8533 * Some minot code clean up. 2020-07-24 12:08:08 +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
cbb289337d * Ashiok, Nightmare Muse - Fixed rule text. 2020-07-24 12:01:20 +02:00
LevelX2
329352f36b Hunters' Feast - Fixed rule text (fixes #6878). 2020-07-23 12:22:07 +02:00
LevelX2
04176350db * Pyromancer's Gauntlet - Fixed that the effect was applied to all damage of planeswalker not only to planeswalker of the Gauntlets's controller (fixes #6877). 2020-07-23 11:52:09 +02:00
ingmargoudt
152d4f1b6a
Merge pull request #6879 from magefree/m21_test 
move single tests to set package
 2020-07-23 08:53:27 +02:00
Ingmar Goudt
5dc707339e move single tests to set package 2020-07-23 08:43:23 +02:00
LevelX2
a2511cad32
Merge pull request #6388 from nivertius/satyr-firedancer-multiple-opponents 
Satyr Firedancer doesn't triggers for each opponent
 2020-07-22 12:52:35 +02:00
Phred
5587791c32
removed unused git options 2020-07-22 04:15:09 -05:00
Phred
bcb6cd6a35
testing faster build times 2020-07-22 04:00:36 -05:00
LevelX2
73395aabd4 * Fecundity - Fixed that not always LKI was retrieved to check if a creature died (fixes #6867). 2020-07-22 00:04:29 +02:00
LevelX2
ba7a8ecb82 Merge origin/master 2020-07-21 23:47:29 +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
61c42f4d5b
Merge pull request #6868 from Grath/patch-3 
Epitaph Golem puts card on top, rather than bottom
 2020-07-21 07:15:12 +02:00
Eric Nelson
e9960fa908
Epitaph Golem puts card on top, rather than bottom 
PutOnLibraryTargetEffect's parameter is "onTop", it should be false (for putting the cards on the bottom) rather than true (for putting the cards on top.)
 2020-07-20 20:57:53 -04:00
LevelX2
7f3b24365e * Essence of the Wild - Fixed the copy effect. 2020-07-21 00:20:12 +02:00
LevelX2
601fb525a8 * Enigmatic Incarnation - Added process action after the sacrifice (fixes #6250). 2020-07-20 22:48:07 +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
f7b3e33f92 * Diamond Kaleidoscope - Fixed available mana calculation (#6698). 2020-07-20 11:20:13 +02:00