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

10931 commits

Author SHA1 Message Date
Scott Crawford
83f6b142ff Removing minuses 2017-05-04 08:48:03 -07:00
Scott Crawford
a0738ae59d Restoring Starter1999 
Fixing accidental deletion from previous commit
 2017-05-04 08:09:27 -07:00
LevelX2
2832cb9335 * Some minor changes to Misfortune's Gain and Path of Peace. 2017-05-04 10:26:34 +02:00
Scott Crawford
d5c5b0cdb9 fixed spacing 2017-05-03 19:43:23 -07:00
Scott Crawford
f88876d137 Misfortune's Gain 
implemented misfortune's gain
 2017-05-03 19:41:10 -07:00
Scott Crawford
61e3166492 Path of Peace 
implemented Path of Peace
 2017-05-03 19:37:41 -07:00
Scott Crawford
b2db8057b5 New cards 
Generated Misfortune's Gain and Path of Peace
 2017-05-03 19:37:18 -07:00
LevelX2
01171abad2 Merge pull request #3284 from spjspj/master 
Large Refactor - Move all tokens into Mage/src/main/java/mage/game/pe…
 2017-05-03 15:40:32 +02:00
LevelX2
e862e7c5b5 Merge origin/master 2017-05-03 14:59:47 +02:00
LevelX2
e73a2f5c58 * Nest of Scarabs - Fixed that did not produce tokens when -1/-1 counters are placed on creatures. (fixes #3174). 2017-05-03 14:59:21 +02:00
Derek M
03237aa2fe Merge pull request #3295 from ingmargoudt/triumph_hordes_unittest 
Triumph hordes unittest
 2017-05-03 07:53:47 -04:00
igoudt
566966bf6b fix and test for triumph of the hordes 2017-05-03 11:02:23 +02:00
LevelX2
69ac72e242 Merge origin/master 2017-05-03 09:30:05 +02:00
LevelX2
c46a292d14 * Added missing card entry of Celestial Gatekeeper to Prophecy set. 2017-05-03 09:29:44 +02:00
bugfi5h
d43aefa5e3 removed unused imports 2017-05-01 18:27:45 +02:00
bugfi5h
a1dba938a4 Added Card: Entangler 2017-05-01 18:24:10 +02:00
bugfi5h
72ec960c95 Merge branch 'develop' into feature/CopperAngel 2017-05-01 15:10:56 +02:00
spjspj
1754a69f9b Large Refactor - Move all tokens into Mage/src/main/java/mage/game/permanent/token 2017-05-01 20:20:33 +10:00
Dustin Ryan - Roepsch
4c7ab8babe removed extra line 2017-04-30 17:56:08 -05:00
Dustin Ryan - Roepsch
640f1bea5b Fixed card text 2017-04-30 17:53:12 -05:00
Dustin Ryan - Roepsch
c6f4332f2e fixed static text 2017-04-30 17:29:39 -05:00
Dustin Ryan - Roepsch
db608dc35d optimized imports 2017-04-30 16:15:24 -05:00
Dustin Ryan - Roepsch
8aee5d795c Implemented Heat Stroke 2017-04-30 16:14:39 -05:00
Dustin Ryan - Roepsch
3b82e3c2bf Generated card template using pearl script 2017-04-30 15:31:06 -05:00
ingmargoudt
f0a83c4689 Merge pull request #3281 from ingmargoudt/gatherer_of_graces 
Implemented Gatherer of Graces from Guildpact
 2017-04-30 19:00:34 +02:00
igoudt
a1f2c742be Implemented Gatherer of Graces from Guildpact 2017-04-30 18:59:08 +02:00
Derek M
5bfd84f6ac Merge pull request #3280 from ingmargoudt/quicksilver_fountain 
fix for quicksilver fountain, as it let you target all lands in play …
 2017-04-30 12:47:22 -04:00
igoudt
01813cce0c fix for quicksilver fountain, as it let you target all lands in play instead of your own 2017-04-30 17:45:23 +02:00
ingmargoudt
bffc04a49e Merge pull request #3277 from ingmargoudt/kyren_negotiations 
implemented Kyran Negatiations from Mercadian Masques
 2017-04-30 15:08:01 +02:00
igoudt
8512e3043d implemented Kyran Negatiations from Mercadian Masques 2017-04-30 15:05:21 +02:00
igoudt
801aa98430 remove imports 2017-04-30 10:27:43 +02:00
igoudt
f9a5bc59c3 fix for gate to the afterlife 2017-04-30 10:26:47 +02:00
igoudt
b6fe6f772a finish rewriting watchers 2017-04-29 12:07:46 +02:00
igoudt
efae1251f9 first batch of watcher naming 2017-04-29 12:07:46 +02:00
igoudt
20a881a374 make the condition in cards an enum 2017-04-29 12:01:49 +02:00
igoudt
3e5ff8ccb2 rewrites to getOrDefault 2017-04-29 12:01:49 +02:00
igoudt
f69ff3aca9 rewrote InfernoTrap 2017-04-29 12:01:49 +02:00
ingmargoudt
12eb4c2fb7 Merge branch 'master' into move_magepermanent_method 2017-04-28 19:29:20 +02:00
LevelX2
26e81ab26d * Added UT for #3251. 2017-04-28 15:41:38 +02:00
LevelX2
47de4cac6b * Squandered Resources - Fixed that the ability was no mana ability (fixes #3259). 2017-04-28 14:25:04 +02:00
LevelX2
236608cd0f * Approach Of The Second Sun - Fixed that it did not always correctly determined if a player has won (fixes #3250). 2017-04-28 14:18:58 +02:00
LevelX2
33f6c629c2 * Shadow of the Grave - Some minor adjustments. 2017-04-28 11:18:26 +02:00
LevelX2
7f1da83783 Merge pull request #3261 from ingmargoudt/fix_cyclediscardwatcher 
fix for shadow of the grave
 2017-04-28 11:04:24 +02:00
LevelX2
108f3faaa8 * Natural Balance - Some minor changes. 2017-04-28 10:56:44 +02:00
LevelX2
468440cb71 Merge pull request #3248 from bugfi5h/master 
Added Card: Natural Balance
 2017-04-28 10:35:12 +02:00
LevelX2
3cc3d430ea * Bontu the Glorified - Fixed that it was possible to sacrifice non creature permanents. 2017-04-28 10:26:51 +02:00
igoudt
10ecbd5adb fix for shadow of the grave 2017-04-28 09:24:27 +02:00
bugfi5h
217e294470 Added Card: Copper-Leaf Angel 2017-04-27 21:25:30 +02:00
igoudt
2c34870bf0 remove util function on converted manacost, make getColorIdentity default interface method 2017-04-27 10:57:48 +02:00
igoudt
8a80976171 have Flash and Tariff use the moved removeVariableManaCost method 2017-04-27 10:57:48 +02:00