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

18107 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Simown
1a46435664 Fixed blocking in the Unit Test Framework 2017-04-19 21:53:20 +01:00
Jeff
c5b3975700 - Changed == to equals(). 2017-04-19 15:05:23 -05:00
fireshoes
ad3e5749f5 Added Planeswalker Decks to Sample Decks. 2017-04-19 11:46:20 -05:00
Jeff
10a043f19b - Fixed Soul-Scar Mage. Bug #3163 2017-04-19 11:02:27 -05:00
LevelX2
04c80c27a3 * Fixed Binding Mummy's ability doesn't trigger from Liliana, Death Majesty -3 ability (fixes #3165). 2017-04-19 16:40:00 +02:00
LevelX2
0b827b239c * Fixed the handling of comparing characteristics concerning split cards (related to the recent rule changes). 2017-04-19 12:36:46 +02:00
ingmargoudt
4b421fa722 Merge pull request #3173 from ingmargoudt/wandering_fumarole_color 
small fix on color
 2017-04-19 12:16:43 +02:00
ingmargoudt
58b1c4c0c8 small fix on color 2017-04-19 12:15:36 +02:00
Derek M
4fc47b163a Merge pull request #3172 from drmDev/ut/lillydm 
UT confirming bug #3165
 2017-04-18 23:40:57 -04:00
drmDev
97d60a940c add type checking 2017-04-18 23:40:19 -04:00
drmDev
cb70af6f50 UT confirming bug for #3165 2017-04-18 23:38:08 -04:00
Derek M
6789f2f227 Merge pull request #3171 from drmDev/ut/pmass 
UT confirming bug #3167
 2017-04-18 23:36:35 -04:00
drmDev
513f5dfb7d UT confirming bug #3167 2017-04-18 23:36:00 -04:00
fireshoes
c88584b619 Merge origin/master 2017-04-18 21:15:41 -05:00
fireshoes
b3fb142998 Added Split Card CMC tests for recent rule change. 2017-04-18 21:14:14 -05:00
spjspj
7ca5adff89 Merge pull request #3169 from spjspj/master 
Undo double tap of ok button (Leading to duplicate tournaments - Fixe…
 2017-04-19 10:31:18 +10:00
spjspj
5373997b30 Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154) 2017-04-19 10:30:40 +10:00
fireshoes
e5e614c341 [AKH] Added common tapland cycle shown in the Gatherer 2017-04-18 19:07:03 -05:00
LevelX2
01153965c4 * Mimic Vat - Fixed possible null pointer exception. 2017-04-19 00:07:34 +02:00