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

17568 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ingmargoudt
52af50f77e Merge pull request #2860 from kubikrubikvkube/master 
We should not create additional Strings in loop.
 2017-02-13 15:04:36 +01:00
vraskulin
5e410df39e We should not create additional Strings in loop. It have perfomance impact. Using StringBuilder instead. 2017-02-13 15:03:23 +03:00
LevelX2
7f866f1b21 Merge pull request #2859 from goesta/FlusterstormTest 
Added Flusterstorm test
 2017-02-13 00:06:45 +01:00
LevelX2
2e8d68aa4b Merge pull request #2858 from goesta/SpellskiteTest 
Added Spellskite split damage test
 2017-02-13 00:06:17 +01:00
LevelX2
0b6fbbe5e4 Merge pull request #2857 from goesta/ChampionOfLambholtTest 
Champion of Lambholt test
 2017-02-13 00:05:52 +01:00
LevelX2
b08d596b17 Merge pull request #2855 from goesta/KalastriaHealerTest 
Added Test for Kalastria Healer
 2017-02-13 00:05:31 +01:00
ingmargoudt
86bae57d87 Merge pull request #2856 from ingmargoudt/master 
rewrites and cleanups
 2017-02-12 13:37:01 +01:00
Goesta
0bccc7ab49 Added Flusterstorm test 2017-02-12 05:32:25 +01:00
Goesta
b39996e1eb Added Spellskite spit damage test 2017-02-12 04:30:01 +01:00
Goesta
ce78f64fab Added test for Champion of Lambholt 2017-02-11 23:45:20 +01:00
ingmargoudt
3a152ab3d6 rewrote enum comparisons, iterator to removeIf, added some stream and filters 2017-02-11 22:37:00 +01:00
Goudt
05e5ca3c78 Merge branch 'master' of https://github.com/magefree/mage 2017-02-11 20:44:11 +01:00
ingmargoudt
20b24e3360 Merge pull request #2846 from kubikrubikvkube/master 
Singleton object should not have map with values that can't be GCed
 2017-02-11 20:43:32 +01:00
Goudt
fa67eab914 Merge branch 'master' of https://github.com/magefree/mage 2017-02-11 20:38:20 +01:00
Goesta
a21128932b Added Test for Kalastria Healer 2017-02-11 20:18:46 +01:00
spjspj
d30e959f43 Merge pull request #2854 from spjspj/master 
Implement Parallax Nexus
 2017-02-11 20:13:32 +11:00
spjspj
9b8f1b3d5c Implement Parallax Nexus (NEM) 2017-02-11 20:11:17 +11:00
LevelX2
b316b5b0a0 Merge pull request #2852 from goesta/GontisMachinationsFix 
Changed GontisMachinations effect from damage to loseLife
 2017-02-11 08:34:18 +01:00
Goesta
197259929e Changed GontisMachinations effect from damage to loseLife 2017-02-11 03:11:32 +01:00
Jeff
fc3ecdf8d0 - Added Auratouched Mage and test suite. 2017-02-10 10:15:56 -06:00
spjspj
4f13d89849 In testmode, ok to not send an email. 2017-02-11 01:26:52 +11:00
spjspj
a897f2d91e Merge pull request #2851 from spjspj/master 
Update some edh power levels
 2017-02-11 00:53:46 +11:00
spjspj
dfbdc058cf Update some edh power levels 2017-02-11 00:52:58 +11:00
Jeff
1e82f0750a Fixed FlashbackTest and made modifications to CascadeAbility allowing it to pass its test suite. 2017-02-09 10:20:21 -06:00
vraskulin
f99cd21275 Mostly code format fixes. 2017-02-09 18:30:31 +03:00