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

17843 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingmargoudt
48a1fe8602 Merge pull request #2880 from ingmargoudt/master 
put the writing of equipped and enchanted in the attachmenttype
 2017-02-19 23:59:25 +01:00
ingmargoudt
d0fa00f3af put the writing of equipped and enchanted in the attachmenttype 2017-02-19 23:58:32 +01:00
Achilles
0372eb12e2 - Little fix for a watcher used for Ephara, God of the Polis. 2017-02-19 16:42:32 -06:00
ingmargoudt
2d4c1f9b06 Merge pull request #2879 from ingmargoudt/master 
enum comparisons, return empty set rather than null
 2017-02-19 23:40:30 +01:00
ingmargoudt
972ed6a3f2 changed enum comparison to ==. 
isDependentTo returns empty set rather than null
 2017-02-19 23:38:47 +01:00
ingmargoudt
297203dab5 Merge branch 'master' of https://github.com/magefree/mage 2017-02-19 23:36:10 +01:00
Achilles
899732c403 - Added Menacing Ogre 2017-02-19 15:04:48 -06:00
ingmargoudt
ed5ba74093 Merge branch 'master' of https://github.com/magefree/mage 2017-02-19 20:53:02 +01:00
ingmargoudt
526022c87d Merge pull request #2877 from ingmargoudt/master 2017-02-19 19:46:11 +01:00
ingmargoudt
e882594802 Merge branch 'master' of https://github.com/magefree/mage 2017-02-19 10:44:43 +01:00
Eric McVicker
0906623d4f Merge pull request #2878 from JOAC69/master 
Fix failing tests that were doing Object.Equels where == was needed
 2017-02-19 02:33:28 -06:00
JOAC69
845e406d63 Fix failing tests that were doing Object.Equels where == was needed 2017-02-19 02:31:04 -06:00
ingmargoudt
a98df9a28e fix javadoc 2017-02-19 09:13:19 +01:00
ingmargoudt
9ea690797f the card should still be exiled. 
added a method to test exile count per player
added a test for chandrapyromaster
 2017-02-19 09:09:43 +01:00
ingmargoudt
d729ab31d2 ChandraTorchOfDefiance should only be able to cast spells with a casting cost. Cards like Ancestral Visions can not be cast. 2017-02-18 22:49:43 +01:00
Plopman
4201520cb4 Fix Ashling's Prerogative effects were not correctly copied. Fix #2875. 2017-02-18 16:42:37 +01:00
Achilles
7165c0bd74 - Little fix to Phyrexian Tyranny. Changed damage to loss of life. 2017-02-18 08:53:18 -06:00
Achilles
f109ff7f1e Revert "- Little fix to Phyrexian Tyranny. Changed damage to loss of life." 
This reverts commit 457eec8531f827f90502774cfff2a775feefe25c.
 2017-02-18 08:51:20 -06:00
Achilles
b874fc1672 - Little fix to Phyrexian Tyranny. Changed damage to loss of life. 2017-02-18 08:51:15 -06:00
spjspj
24c08e14e4 Merge pull request #2876 from spjspj/master 
Limit messages to 500 characters
 2017-02-18 20:33:28 +11:00
spjspj
a6e34c040b Limit messages to 500 characters 2017-02-18 20:32:22 +11:00
Achilles
d71956ef2f - Converted Dimir Doppleganger and Lazav, Dimir Mastermind to the CopyEffect method. Fixes an issue with copy of a copy, i.e. Stunt Double 2017-02-17 22:17:18 -06:00
LevelX2
899046cf16 * Gratuitous Violence - FIxed that if the damage of a creature with lifelink was doubeled only the non doubled amount was added to life. 2017-02-18 01:26:02 +01:00
LevelX2
88eeb2e0e1 * Canopy Cover - FIxed possible null pointer exception (fixes #2874). 2017-02-17 23:49:03 +01:00
LevelX2
e6be0577bb Fixed a bug of FirstSpellCastThisTurnWatcher (fixes #2871). 2017-02-17 23:23:33 +01:00
ingmargoudt
26ce8e0bcc Merge pull request #2870 from ingmargoudt/master 
refactor of watchers to use map functions
 2017-02-16 15:33:56 +01:00
ingmargoudt
cf23d0905b mentioned the wrong hashmap (confusing names!!!) 2017-02-16 15:14:44 +01:00
ingmargoudt
14c459b924 solving review issues 2017-02-16 14:03:25 +01:00
ingmargoudt
570c2c2c5d Merge branch 'master' of https://github.com/magefree/mage 2017-02-15 23:55:29 +01:00
ingmargoudt
7d655ce745 Merge pull request #2866 from goesta/BouncingCrewedVehicleTest 
Bouncing crewed vehicle test
 2017-02-15 23:55:11 +01:00
ingmargoudt
4aa51210f9 refactor of watchers to use map functions 2017-02-15 23:19:40 +01:00
spjspj
fbbfc6c611 Merge pull request #2869 from spjspj/master 
Limit deck to 1000 cards
 2017-02-16 08:07:17 +11:00
spjspj
b65c1180e4 Limit deck to 1000 cards 2017-02-16 08:06:23 +11:00
ingmargoudt
a1bc43d33e Merge pull request #2868 from kubikrubikvkube/master 
Functional interfaces annotation and bugfixes
 2017-02-15 20:27:21 +01:00
vraskulin
a15220d51e Bugfixes with != instead of equals and default toString calls 2017-02-15 19:52:20 +03:00
vraskulin
752392fc46 Functional interfaces should be annotated as functional interfaces 2017-02-15 19:23:12 +03:00
ingmargoudt
c2191227cd Merge pull request #2861 from kubikrubikvkube/master 
Bugfix - after 12820b54d4 refactoring
 2017-02-15 16:10:45 +01:00
vraskulin
f1ef3bf68b Narrowed variables scope. 2017-02-15 16:05:18 +03:00
Jeff
09e0e3aaf7 - Added Trade Secrets 2017-02-14 16:37:48 -06:00
Plopman
cafd002634 Fix {Q} and Thousand year elixir. Fix #2349 2017-02-14 23:04:57 +01:00
Plopman
998abc526d Fix Everflame Eidolon when it's an aura. Fix #2178 2017-02-14 23:01:59 +01:00
Plopman
b648295dbd Add mountain Mountainwalk to goblin king. Fix #2865 2017-02-14 21:33:54 +01:00
Goesta
338baa546e Added bouncing a crewed vehicle will uncrew it test 2017-02-14 21:24:53 +01:00
Goesta
5ece29e5d7 Added assertNotType test assertion 2017-02-14 21:19:47 +01:00
Plopman
10284642bc Use spinner instead of combobox for AI skill. Fix #1111 and #118 2017-02-14 21:06:07 +01:00
Jeff
e54b81785d - Added Scythe Specter 2017-02-14 12:50:07 -06:00
Jeff
3596b4517c - Set entries for Auratouched Mage. 2017-02-14 11:14:26 -06:00
ingmargoudt
8a7de69948 Merge pull request #2863 from ingmargoudt/master 
fix counters
 2017-02-13 21:47:43 +01:00
ingmargoudt
26e16be772 fix counters 2017-02-13 21:45:37 +01:00
vraskulin
09da478b38 Bugfix - after 12820b54d4 refactoring arrow does not disappear from the screen. Rollback. 2017-02-13 18:56:26 +03:00