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

19540 commits

This branch
This branch
All branches
Author SHA1 Message Date
igoudt
05785f71b9 Make the implementations of CardImageSource an enum 2017-04-27 10:57:48 +02:00
igoudt
3f47d5a253 put inputstream in try body so it can be autoclosed 2017-04-27 10:57:48 +02:00
igoudt
0528555075 make DefaulActionCallback an enum and remove unused parameter 2017-04-27 10:57:48 +02:00
igoudt
ce26e5c8dd make the combatmanager an enum 2017-04-27 10:57:48 +02:00
igoudt
5b21f34941 rewrote gettypetext, added removeIf to TableModel 2017-04-27 10:57:48 +02:00
igoudt
27aea04820 move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription 2017-04-27 10:57:48 +02:00
bugfi5h
33f2f3e9fc Merge branch 'master' of https://github.com/magefree/mage 2017-04-27 06:51:17 +02:00
bugfi5h
59a790e320 Using getPlayersInRange instead of getPlayersList 2017-04-27 06:33:35 +02:00
Derek M
b3110af503 Merge pull request #3255 from drmDev/bug/changeMeldReminder 
removing the italics from reminder text for meld cards. might fix the…
 2017-04-26 21:23:30 -04:00
drmDev
43a001dcdd removing the italics from reminder text for meld cards. might fix the issue in #3129 2017-04-26 21:22:22 -04:00
Derek M
139a75eea5 Merge pull request #3254 from drmDev/master 
updated banned standard list to include felidar guardian
 2017-04-26 20:56:40 -04:00
drmDev
fae65241e2 updated banned standard list to include felidar guardian 2017-04-26 20:56:10 -04:00
Derek M
6edc8457bf Merge pull request #3253 from drmDev/master 
added comments noting tests currently failing and their associated is…
 2017-04-26 20:20:58 -04:00
drmDev
abcc34432e added comments noting tests currently failing and their associated issues 2017-04-26 20:20:26 -04:00
bugfi5h
f20496e40f Auto indent class 2017-04-26 23:11:46 +02:00
bugfi5h
4a8af2b4d2 Merge origin/master 2017-04-26 19:44:24 +02:00
bugfi5h
e2f960c8fd Added Card: Natural Balance 2017-04-26 19:41:18 +02:00
LevelX2
347d3bf105 Merge origin/master 2017-04-26 15:04:16 +02:00
LevelX2
837940b78d * Added UT for #3055 - Not able to reproduce. 2017-04-26 15:03:45 +02:00
Achilles
ba2456188f Reverted this commit that broke a watcher. Fixes #3246 2017-04-26 07:59:16 -05:00
LevelX2
86bc78e4b8 * Nest of Scarabs - Fixed that it does not produce tokens when -1/-1 counters are placed on creatures. 2017-04-26 14:36:52 +02:00
Derek M
257a0ba433 Merge pull request #3245 from drmDev/master 
fixed UT for #3195. misinterpretted ruling. closing #3195
 2017-04-26 00:05:51 -04:00
drmDev
0c16207332 fixed UT for #3195. misinterpretted ruling. closing #3195 2017-04-26 00:05:12 -04:00
Derek M
c4330415c1 Merge pull request #3241 from drmDev/master 
Unit test confirming issue #3195 with Combat Celebrant
 2017-04-25 22:09:14 -04:00
drmDev
04746c5f4f Unit test confirming issue #3195 allowing Celebrant to attack while exerted 2017-04-25 22:07:51 -04:00
ingmargoudt
a9c31cd057 Merge pull request #3240 from ingmargoudt/playertype_fix 
fix on playertype enum comparison
 2017-04-26 00:38:53 +02:00
igoudt
c1ce821340 fix on playertype enum comparison 2017-04-26 00:37:06 +02:00
LevelX2
7e9d4ab515 * DreadshipReef - Fixed that the 3rd ability did not create mana (fixes #3223). 2017-04-25 23:27:24 +02:00
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