Commit graph

18226 commits

Author SHA1 Message Date
spjspj
75e096258c Merge pull request #3211 from spjspj/master
spjspj - Add option of adding in Tokens from the init.txt file
2017-04-23 02:54:03 +10:00
spjspj
94ea9b8ebd spjspj - Add option of adding in Tokens from the init.txt file
token:Human:MerfolkWizardToken:1
token:Human:GermToken:1
are examples
2017-04-23 02:51:49 +10:00
Simown
02bc743052 Merge pull request #3210 from Simown/TestFix
Fixed unit test that swapped the attacker and blocker
2017-04-22 14:58:10 +01:00
Simown
35549bac52 Fixed unit test that swapped the attacker and blocker
- Also now is a 2/2 blocking a 1/1 so no more confusion
2017-04-22 14:52:16 +01:00
spjspj
ecaba8dab3 Merge pull request #3209 from spjspj/master
spjspj - Removed View Limited Deck option
2017-04-22 19:37:26 +10:00
spjspj
f73c30812e Merge branch 'master' of https://github.com/spjspj/mage 2017-04-22 19:36:28 +10:00
spjspj
8845d77628 spjspj - Remove View Limited Deck option 2017-04-22 19:35:08 +10:00
spjspj
9f0e0a6907 Merge pull request #3208 from spjspj/master
spjspj - Add a View Limited Deck option to allow you to see your deck…
2017-04-22 19:27:47 +10:00
spjspj
ca519894b5 spjspj - Add a View Limited Deck option to allow you to see your deck during matches. 2017-04-22 19:26:59 +10:00
spjspj
3a9c06af61 Merge pull request #3206 from spjspj/master
spjspj - Add a View Limited Deck option to allow you to see your deck…
2017-04-22 19:16:57 +10:00
spjspj
0cd4e06e22 spjspj - Add a View Limited Deck option to allow you to see your deck during matches. 2017-04-22 19:16:12 +10:00
LevelX2
3f8b193da6 * Added UT: Cojutai's Command, returning Baral + counter creature won't trigger baral's ability (#3202). Bug is not reproducable yet. 2017-04-22 10:25:00 +02:00
Achilles
c943774e6f - A simple UT for Bug #3072. Will expand later. 2017-04-21 20:40:40 -05:00
LevelX2
4c4d78c2e1 * Added UT: Channeler Initiate did not get it's -1/-1 counters when reanimated with Supernatural Stamina. Bug is not reproducable yet. 2017-04-22 01:05:46 +02:00
LevelX2
a93dc4e3da * Added a check that continuous PT setting effects are only applied, if the object has still the ability (fixes #3167).
I added the effect now only to the layer the bug is caused by. Probably it's correct to check this for every layer. But I don't know how much resources the check addional needs. So if we got other tests that fail for this reason caused by other layers, we could add the check and test if all other tests still work correctly.
2017-04-22 00:23:37 +02:00
Jeff
da6b5cae53 - Added test for Selvala, Heart of the Wilds 2017-04-21 16:54:46 -05:00
Jeff
978cb04209 - Added @Ignore to a specific test. Works fine in the game. 2017-04-21 14:02:31 -05:00
magenoxx
ee7026f71d Revert "Added hashCode and equal to main server objects"
This reverts commit 27a454f042.
2017-04-21 20:43:32 +03:00
LevelX2
5d2c210d36 * Added Celestial Convergence and some changes to game draw handling. 2017-04-21 15:27:22 +02:00
LevelX2
e284922017 * Added Celestial Convergence and some changes to game draw handling. 2017-04-21 15:18:04 +02:00
Derek M
274e0f9052 Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire
Implementing Guilty Conscience and Backfire
2017-04-20 20:40:03 -04:00
Clint Herron
523743aaf6 Fixing nits from LevelX2 -- adding authorship tag and marking both enchantments as unboost effects, because both are things that you would tend to want to play on your opponents' creatures -- not your own. This should help the AI make more sensible plays when using these. 2017-04-20 19:03:05 -04:00
magenoxx
f02999910a Merge branch 'master' of github.com:magefree/mage 2017-04-20 22:46:51 +03:00
Simown
8e028a1c32 Updated and added blocking requirements unit tests 2017-04-20 20:33:16 +01:00
Simown
354ca1c062 Fix to TestPlayer blocking multiple creatures 2017-04-20 20:33:16 +01:00
Derek M
fd148be718 Merge pull request #3199 from drmDev/ut/cruel-reality
UT suite for cruel reality, unable to confirm issue #3191
2017-04-20 15:30:54 -04:00
Derek Monturo
3246bd4551 UT suite for cruel reality, unable to confirm issue #3191 2017-04-20 15:30:00 -04:00
Jeff
5f05868865 - Fixed Glyph Keeper. Bug #3180 2017-04-20 14:19:54 -05:00
magenoxx
27a454f042 Added hashCode and equal to main server objects 2017-04-20 20:06:52 +03:00
magenoxx
21eb420c16 Moved Mage.Common classes from src to src/main/java 2017-04-20 19:05:09 +03:00
fireshoes
a86a1ebf5f Added Iconic Masters to known-sets/mtg-sets-data.txt 2017-04-20 10:37:16 -05:00
fireshoes
399d589358 Added Sam Black's No Search Cube. 2017-04-20 09:59:51 -05:00
Jeff
cb3f0b2a51 - Fixed Cruel Reality and Sigarda, Host of Herons interaction. 2017-04-20 08:44:49 -05:00
Derek M
e9d31aa93c Merge pull request #3185 from HanClinto/CMH-FixPredicate
Fix for "Inference variable T#1 has incompatible bounds"
2017-04-20 04:37:23 -04:00
Derek M
953fc0952a Merge pull request #3192 from drmDev/ut/exert
UTs for exert. confirms fixes #3183
2017-04-20 04:34:07 -04:00
drmDev
20468d168b UTs for exert. confirms fixes #3183 2017-04-20 04:33:34 -04:00
Derek M
c93771d1a4 Merge pull request #3188 from HanClinto/CMH-Fix3183
Fix for stolen exert creatures that should untap during their owner's next untap step.
2017-04-20 01:28:45 -04:00
Derek M
eefdcf3801 Merge pull request #3190 from drmDev/ut/glyph
adjusted phases - was using dif one for testing
2017-04-20 00:45:25 -04:00
drmDev
23834a061c adjusted phases - was using dif one for testing 2017-04-20 00:43:46 -04:00
Derek M
1b5e8c149d Merge pull request #3189 from drmDev/ut/glyph
UTs duplicating glyphkeeper issue #3180
2017-04-20 00:39:31 -04:00
drmDev
0e95e39748 UTs duplicating glyphkeeper issue #3180 2017-04-20 00:38:32 -04:00
Clint Herron
d82687bdc4 Fixing check for objects that should not untap during a specific player's next untap step ('your next untap step' vs. 'its controllers next untap step' lanugage) 2017-04-19 23:56:20 -04:00
Derek M
a098718405 Merge pull request #3186 from drmDev/ut-cleanup
UT cleanup to note which ones are currently failing
2017-04-19 23:37:17 -04:00
drmDev
43af2e503c UT cleanup to note which ones are currently failing and associtaed issues in github fo rthem 2017-04-19 23:36:19 -04:00
Clint Herron
48cde05cff Fixing additional instances where unspecified types could lead to errors 2017-04-19 22:55:48 -04:00
Clint Herron
8174f53a8c Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work. 2017-04-19 22:31:15 -04:00
Clint Herron
30e0ef863d Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work. 2017-04-19 22:31:02 -04:00
Clint Herron
f461899eec Changing description to match 'enchanted creature' properly now so that Backfire now has the correct reminder text. 2017-04-19 22:18:49 -04:00
Clint Herron
98eea3c97b Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-04-19 21:49:10 -04:00
Jeff Wadsworth
9ca68a0603 Merge pull request #3176 from Simown/master
Fixed blocking in the Unit Test Framework
2017-04-19 20:45:15 -05:00