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

16105 commits

This branch
This branch
All branches
Author SHA1 Message Date
drmDev
f593623508 finished implementation of cards. CardView bug fix for card number change. 2016-07-26 22:58:20 -04:00
drmDev
b7c4eec90f Merge branch 'master' of https://github.com/drmDev/mage 2016-07-26 20:00:37 -04:00
Derek M
8d67ddde5c Merge pull request #2122 from fwannmacher/master 
Fixed some bugs
 2016-07-26 19:20:27 -04:00
fwannmacher
ec0e8181d5 - Fixed Issue #1660 2016-07-26 19:34:06 -03:00
fwannmacher
3caf66e4b6 - Fixed Issue #2108 2016-07-26 19:34:06 -03:00
fwannmacher
231a18a79c - Fixed Issue #2121 2016-07-26 19:34:06 -03:00
fireshoes
ad3f3649da Added FNM promo Rise from the Tides. 2016-07-26 13:52:36 -05:00
drmDev
54fcc1c408 WIP Syphon Flesh, Gravestorm, Gravespawn Sovereign implementations 2016-07-26 14:46:32 -04:00
Derek M
218583ebf8 Merge pull request #2120 from Dilnu/master 
Fix all known cases of Issue #2106
 2016-07-26 11:19:44 -04:00
Samuel Sandeen
2173069c09 Update Legerdemain to use filters in targeting. 
Fix the way targeting is handled on Legerdemain.

Previously it was possible to get into an impossible state if there was
no valid second target.
 2016-07-26 08:33:33 -04:00
drmDev
18a6e5392b Bloodscale Prowler, Burning Tree Bloodscale,Gristleback implemented 2016-07-26 06:35:47 -04:00
drmDev
64192292c1 adjusted card gen template to work with cardNumber change 2016-07-26 05:41:59 -04:00
drmDev
f56b81b243 Trigon of Mending bug fix - allows targetting player 2016-07-25 23:46:01 -04:00
Samuel Sandeen
4c9a49df5b Merge remote-tracking branch 'magefree/master' 2016-07-25 21:58:43 -04:00
Samuel Sandeen
c12959e025 Standardize Another target logic in some cases. 
This removes custom targets and instead uses the AnotherTargetPredicate
to filter.
 2016-07-25 21:58:11 -04:00
Samuel Sandeen
67194253e4 Fix simple issues in target specification 2016-07-25 21:53:12 -04:00
drmDev
bc14f8176a Merge remote-tracking branch 'upstream/master' 2016-07-25 18:23:35 -04:00
drmDev
aa2605d6cf Tribal Unity cardNumber to string fix 2016-07-25 18:16:40 -04:00
Derek M
5c4059fac6 Merge pull request #2118 from fwannmacher/master 
Corrected some more bugs
 2016-07-25 18:14:00 -04:00
fwannmacher
cbd0e36f97 - Fixed Issue #2100 2016-07-25 17:55:38 -03:00
fwannmacher
1fc81b8bc7 - Fixed Issue #2094 2016-07-25 17:25:53 -03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
fwannmacher
cd22b3013b - Fixed Issue #2102 2016-07-25 16:41:28 -03:00
fwannmacher
9f08ce8b56 - Fixed Issue #2071 2016-07-25 15:59:49 -03:00
fwannmacher
9390ec20b0 - Fixed Issue #2098 2016-07-25 12:52:01 -03:00
drmDev
f2cb945744 Spectral Shepherd double check to only target spirits you control 2016-07-25 11:11:59 -04:00
drmDev
877106c2ad Merge remote-tracking branch 'upstream/master' 2016-07-25 09:31:54 -04:00
spjspj
2d80a3ca00 Merge pull request #2117 from spjspj/master 
spjspj - Update to push deck List across from Client to Server for Cu…
 2016-07-25 22:49:13 +10:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
drmDev
6584079d7a bug fix for Tunnel Vision when it does not find card in library 2016-07-25 06:43:51 -04:00
drmDev
9d9265e02b Delve bug comments, Delve should not target. See issue #1646 2016-07-25 06:08:31 -04:00
drmDev
4082f9c38d Fixed Brood Sliver test for #1660 2016-07-25 05:45:30 -04:00
drmDev
f883fd345f Brood Sliver test - bug unconfirmed #1660 2016-07-25 05:28:13 -04:00
Derek M
0f48520697 Merge pull request #2115 from Dilnu/master 
Implement new cards and fix a bug with two existing ones.
 2016-07-25 04:48:27 -04:00
Samuel Sandeen
3aa480cef8 Merge remote-tracking branch 'magefree/master' 2016-07-24 22:07:15 -04:00
Samuel Sandeen
68e84d9c23 Modify the way some second targets are chosen 
If implemented the wrong way when you try to choose second targets the
game can get into an impossible state this fixes three such cards.
 2016-07-24 22:07:04 -04:00
drmDev
099e490e4d patching up possible NPEs on quiet speculation 2016-07-24 21:49:36 -04:00
drmDev
f1343dd03f Quiet Speculation bugfix for #1970 - controller searches target player library 2016-07-24 21:47:41 -04:00
Samuel Sandeen
d97d9ea130 Merge remote-tracking branch 'magefree/master' 2016-07-24 18:02:53 -04:00
Samuel Sandeen
d812ce8fb4 Fix Spelling 2016-07-24 18:02:37 -04:00
Samuel Sandeen
5e26638ab5 Fix a bug in Tribal Unity 
BoostAllOfChosenSubtypeEffect was too specific and didn’t apply to this
situation. It has been replaced with it’s superclass BoostAllEffect
 2016-07-24 18:02:22 -04:00
drmDev
e77033f30c Spreading Flames damage fix 2016-07-24 16:59:13 -04:00
drmDev
abacbfcdd2 Pulmonic Sliver bug confirmed for issue #2108 2016-07-24 15:59:30 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
drmDev
232ad196eb Mind Shatter tests to confirm bug #2110 2016-07-24 14:46:50 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
Samuel Sandeen
05d88b46dd Merge remote-tracking branch 'magefree/master' 2016-07-24 11:53:11 -04:00
drmDev
fc06e31cda Merge remote-tracking branch 'upstream/master' 2016-07-24 11:48:36 -04:00
drmDev
7439134356 added tests for discard replacement effects in general 2016-07-24 11:48:12 -04:00
LevelX2
bd70f923b7 * Permeating Mass - Fixed that the copy effect did only work, if Permeating Mass did not die from combat damge. 2016-07-24 17:13:53 +02:00