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

18361 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derek M
6d52ec5a59 Merge pull request #3377 from spjspj/master 
Emblems refactor to show emblems in Card/Token Viewer
 2017-05-14 12:00:58 -04:00
spjspj
739cbd12a3 Minor add to infinite combo 2017-05-14 21:51:29 +10:00
LevelX2
a045196572 Merge pull request #3370 from magefree/feature/fix_new_perspectives_freeze 
magenoxx branch - Feature/fix new perspectives freeze
 2017-05-14 06:47:08 +02:00
LevelX2
d1e4a7f6b0 Merge pull request #3372 from ingmargoudt/changelings 
change getSubtype(game).contains(..) to hasSubtype(..) to include che…
 2017-05-14 06:32:48 +02:00
spjspj
f85c7e07ba Emblems refactor to show emblems in Card/Token Viewer 2017-05-14 13:43:18 +10:00
Derek M
d0f513cb7b Merge pull request #3376 from drmDev/master 
adjusted New Perspectives tests
 2017-05-13 23:00:35 -04:00
Derek Monturo
a4776b3f4d adjusted New Perspectives tests 2017-05-13 23:00:05 -04:00
emerald000
d5c75cd1b3 Fixed New Perspectives to use a CostModificationEffect. 
Remove CyclingCost and WrapperCost that are now unused.
 2017-05-13 18:53:35 -04:00
igoudt
265cf408f9 change getSubtype(game).contains(..) to hasSubtype(..) to include check on Changelings 2017-05-13 23:35:23 +02:00
Derek M
e5a69134c8 Merge pull request #3371 from drmDev/master 
minor adjustments to new perspectives test
 2017-05-13 13:13:32 -04:00
Derek Monturo
2d91ee49cf minor adjustments to new perspectives test 2017-05-13 13:12:59 -04:00
Derek M
1f4b417e5e Merge pull request #3369 from drmDev/ut/die-exile-fixes 
adjusting tests for #3359. also consolidated kalitas test to here
 2017-05-13 12:38:57 -04:00
Derek Monturo
0fbc86be47 adjusting tests for #3359. also consolidated kalitas test to here 2017-05-13 12:38:07 -04:00
magenoxx
2a366c4022 #3323: New perspectives, fixed deadlock freeze 2017-05-13 18:57:33 +03:00
magenoxx
53228d2389 Added game state change in the loop 2017-05-13 18:56:48 +03:00
magenoxx
d73709bdbe Moved CardView to src/main/java 2017-05-13 18:55:54 +03:00
magenoxx
f912ee6213 Fixed incorrect NewPrespectives test. 3 Mountains caused New Perspectives discard instead of cast. 2017-05-13 17:10:16 +03:00
Derek M
a5c7d55ed6 Merge pull request #3355 from topher235/master 
Implemented Burnt Offering
 2017-05-13 07:54:59 -04:00
Topher
ea90e7c1e3 Implementation of Burnt Offering 2017-05-12 20:46:48 -07:00
ingmargoudt
05349be8c3 Merge pull request #3366 from ingmargoudt/unittests 
Unittests
 2017-05-13 00:32:41 +02:00
igoudt
af533fb0bc API call for changeling on Kaseto 2017-05-13 00:30:25 +02:00
igoudt
074dccf12d fixed Kaseto to trigger on Changeling too. 2017-05-13 00:23:58 +02:00
igoudt
5c3a1c0c72 extra tests for kiraGreatGlassSpinner 2017-05-12 23:14:47 +02:00
Derek M
9790d37ab1 Merge pull request #3365 from drmDev/master 
UTs for #3323 and #3252 confirming bugs
 2017-05-12 16:52:57 -04:00
Derek Monturo
91d24b0e31 UTs for #3323 and #3252 confirming bugs 2017-05-12 16:52:30 -04:00
igoudt
056c0613a2 UT for Final Punishment to cover the DamagedReceivedThisTurnWatcher 2017-05-12 22:47:35 +02:00
igoudt
fc7cdcdc4e small rewrite in the creaturesDiedWatcher 2017-05-12 22:47:35 +02:00
igoudt
7d905d39ca BontuTheGlorified unittests 2017-05-12 22:47:35 +02:00
Derek M
9e7f65bbc8 Merge pull request #3364 from drmDev/master 
modified incendiary flow test for #3359
 2017-05-12 15:33:39 -04:00
Derek Monturo
f992c212eb modified incendiary flow test for #3359 2017-05-12 15:33:08 -04:00
Derek M
6f14f34d10 Merge pull request #3363 from drmDev/ut/exile-instead 
UTs for issue #3359 duplicating issue
 2017-05-12 10:37:59 -04:00
Derek Monturo
29da3a3114 UTs for issue #3359 duplicating issue 2017-05-12 10:37:25 -04:00
Derek M
8102806258 Merge pull request #3358 from drmDev/master 
minor typo
 2017-05-11 19:10:12 -04:00
Derek Monturo
5ee5b9f417 minor typo 2017-05-11 19:09:47 -04:00
Derek M
56771761b6 Merge pull request #3357 from drmDev/master 
another UT for #3345 unable to duplicate issue with celebrant exerting twice in same turn
 2017-05-11 19:08:04 -04:00
Derek Monturo
77749d7fb1 another UT for #3345 unable to duplicate issue with celebrant exerting twice in same turn 2017-05-11 19:07:15 -04:00
Topher
1038a4d4a5 My first attempt at implementing a card. 2017-05-11 12:46:35 -07:00
Derek M
41f87531be Merge pull request #3354 from drmDev/master 
added UT for Witchbane bug #3326 confirming issue
 2017-05-11 14:38:39 -04:00
Derek Monturo
ddf879ee4a added UT for Witchbane bug #3326 confirming issue 2017-05-11 14:37:48 -04:00
Derek M
edcfa68893 Merge pull request #3353 from drmDev/master 
fixed UT for martyr bond
 2017-05-11 13:21:38 -04:00
Derek Monturo
3089e0386c fixed UT for martyr bond 2017-05-11 13:21:13 -04:00
Derek M
da73d3b1cd Merge pull request #3352 from drmDev/master 
CardsInAnyLibraryCondition fixes #3310
 2017-05-11 12:13:35 -04:00
Derek Monturo
ae38095c58 merge 2017-05-11 12:12:20 -04:00
Derek M
e11e0a10cf Merge pull request #3351 from drmDev/ut/shelldock 
UTs for shelldock. duplicating bug reported in #3310
 2017-05-11 11:54:24 -04:00
Derek Monturo
a5fa52b605 UTs for shelldock. duplicating bug reported in #3310 2017-05-11 11:53:55 -04:00
spjspj
5514787871 Merge pull request #3350 from spjspj/master 
Allow sort by EDH Power level in Deck Editor
 2017-05-11 17:54:23 +10:00
spjspj
347d08298f Allow sort by EDH Power level in Deck Editor 2017-05-11 17:52:43 +10:00
spjspj
194b7978d2 Merge pull request #3349 from spjspj/master 
EDH Power level update
 2017-05-11 16:27:10 +10:00
spjspj
5b225fa142 EDH Power level update 2017-05-11 16:25:15 +10:00
spjspj
c11a89a90a Merge pull request #3347 from spjspj/master 
Fix for Martyr's Bond
 2017-05-11 16:14:50 +10:00