Commit graph

20762 commits

Author SHA1 Message Date
LevelX2
85e44017ea Xmage 1.4.23V3 2017-04-25 22:17:22 +02:00
LevelX2
80beebccf5 * Fixed a problem of EndTurnEffect not beeing able to remove stackAbilities and endless looping as a result (fixes #3221). 2017-04-25 21:30:45 +02:00
LevelX2
24b99216f8 * Aftermath - Fixed a bug that caused problems with zone check. 2017-04-25 21:29:21 +02:00
LevelX2
bb4714eb32 Merge origin/master 2017-04-25 19:08:25 +02:00
LevelX2
3f12e1690b * Added 3 cards from Ravinca City of Guilds set. 2017-04-25 19:08:06 +02:00
LevelX2
60cc3a7622 * Some minor fixed and log changes. 2017-04-25 17:37:38 +02:00
LevelX2
9a21b55d39 Merge origin/master 2017-04-25 15:47:50 +02:00
LevelX2
3708ea2a89 * Added 3 cards from Ravinca City of Gold set. 2017-04-25 15:47:21 +02:00
spjspj
9563a610df Merge pull request #3235 from spjspj/master
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 20:16:14 +10:00
spjspj
4c85d89b64 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 20:12:21 +10:00
spjspj
fdd55e70e0 Merge pull request #3234 from spjspj/master
Fix for the audio trigger of 'Player joined the table' not being fired.
2017-04-25 18:18:25 +10:00
spjspj
a4e7c2b407 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 18:17:28 +10:00
LevelX2
d99fe5a70e * Fixed Mimeoplasm allows choosing same creature twice (fixes #3230). 2017-04-25 09:49:43 +02:00
Derek M
9ff5426a34 Merge pull request #3233 from drmDev/master
updated banlist resolves #3232
2017-04-24 23:43:15 -04:00
drmDev
f794b54dda updated banlist resolves #3232 2017-04-24 23:42:31 -04:00
spjspj
be92bf9e41 Merge pull request #3231 from spjspj/master
Add in /card command for chat to get back card's: cost, type, text.
2017-04-25 10:20:09 +10:00
spjspj
1d46fec3ff Add in /card command for chat to get back card's: cost, type, text. 2017-04-25 10:18:00 +10:00
Jeff
11af70f714 - Updated UT for Layers. 2017-04-24 17:03:23 -05:00
Derek M
c4a04dd149 Merge pull request #3229 from drmDev/master
test for #3195 combat celebrant.
2017-04-24 16:28:54 -04:00
Derek Monturo
32cd4cc57d test for #3195 combat celebrant. ut framework does not support testing this scenario 2017-04-24 16:27:45 -04:00
Jeff
2c617ae652 - Updated UT for Auratouched Mage 2017-04-24 10:37:17 -05:00
Jeff
7479cd5668 - Fixed Orator of Ojutai. Intervening If clause. 2017-04-24 09:25:27 -05:00
Achilles
1607849c19 - Fixed Bug #3225 2017-04-23 20:07:40 -05:00
Derek M
89af3e7aaa Merge pull request #3227 from drmDev/bug/wirefly
fixes #3226 wirefly tokens have flying
2017-04-23 19:49:39 -04:00
drmDev
ec6f19f41f fixes #3226 wirefly tokens have flying 2017-04-23 19:48:04 -04:00
Achilles
747c76519e - Fixed filter Commit/Memory 2017-04-23 14:03:12 -05:00
fireshoes
4e1572bc62 Added missing Amonkhet Invocations. 2017-04-23 11:20:17 -05:00
spjspj
ab74433322 Merge pull request #3220 from spjspj/master
Fill in missing str
2017-04-23 23:48:55 +10:00
spjspj
4ed9419cbf Fill in missing str 2017-04-23 23:47:43 +10:00
LevelX2
c085ea148a * Changed some logging messages. 2017-04-23 14:11:02 +02:00
LevelX2
ceb7dbcdf2 * Vizier of Remedies - Fixed a possible null pointer exception. 2017-04-23 14:10:27 +02:00
spjspj
eb96c85578 Merge pull request #3217 from spjspj/master
spjspj - Add in 'View Current Deck' option.
2017-04-23 13:06:53 +10:00
spjspj
6ab4a94bd7 spjspj - Add in 'View Current Deck' option. 2017-04-23 13:06:09 +10:00
Clint Herron
56ce1abb44 Unit tests for Blood Moon + Urborg interaction (#3216)
* Adding unit tests for Blood Moon + Urborg, Tomb of Yawgmoth interaction as per issue #3072 and #2957.  These tests fail expected, confirming those bug reports.

* Re-adding line that was accidentally deleted from other unit test.

* Cleaning up unit tests a bit more and removing leftover code I had missed the first time.
2017-04-22 21:36:01 -05:00
LevelX2
900e7b29ba XMage 1.4.23V2 2017-04-23 01:57:26 +02:00
Achilles
74dd2878ed - Fixed Decimator Beetle. Bug #3212 2017-04-22 14:35:38 -05:00
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