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

23616 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Contis
1ea68e32c4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/cards/c/CephalidSnitch.java
#	Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java
 2018-04-28 22:30:30 -04:00
Thomas Contis
e2a5561a87 Began implementing Cephalid Snitch methods 2018-04-28 22:29:16 -04:00
Thomas Contis
24f6dc6031 Beginning of proper implementation of Cephalid Snitch Methods 2018-04-28 22:25:50 -04:00
Thomas Contis
6c8379fcdc Implemented Cephalid Snitch (Torment) 2018-04-28 22:25:50 -04:00
Thomas Contis
c644e37ff9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/cards/c/CephalidSnitch.java
 2018-04-28 22:19:19 -04:00
Thomas Contis
4ec5563bc6 Beginning of proper implementation of Cephalid Snitch Methods 2018-04-28 22:13:59 -04:00
Brik Royster
54e4c2c484
Update Standard.java 
update comments to reflect actual ban date
 2018-04-28 17:08:43 -07:00
Brik Royster
a514f12196
Fix Brawl.java banlist comments 
These cards were banned in 2018
 2018-04-28 16:11:39 -07:00
Oleg Agafonov
f682bfb527 * [Start Wars] Fixed all tokens (viewer, image download); 2018-04-29 01:20:40 +04:00
Oleg Agafonov
bb3c7232ea * [Start Wars] Fixed Obi-Wan Kenobi emblem (viewer, image download); 2018-04-28 22:43:28 +04:00
Oleg Agafonov
7cb90e2475 * Fixed same images download bug for basic lands in Star Wars set. 2018-04-28 22:23:10 +04:00
Oleg Agafonov
c24ba742f6 Fixed equal or == errors -- 23 cards and more (see #4407) 2018-04-28 21:24:48 +04:00
GitHubMage
af2c3dbb33 Merge remote-tracking branch 'upstream/master' 2018-04-28 19:06:10 +02:00
L_J
97606fc50d
Drain Power while loop logic fix 2018-04-28 13:59:28 +00:00
L_J
d83af8be91
Mana Short text fix 2018-04-28 13:22:26 +00:00
L_J
826eb6843e
Implemented Drain Power 2018-04-28 15:19:16 +02:00
L_J
4446adfadf
Made Mana#includesMana capable of comparing colorless to generic 2018-04-28 13:17:25 +00:00
L_J
34952f173d
Mana Short filter fix 2018-04-28 13:15:31 +00:00
L_J
775fae884f
Merge pull request #52 from magefree/master 
Merge https://github.com/magefree/mage
 2018-04-28 15:05:28 +02:00
LevelX2
15fa8fa124
Merge pull request #4803 from Zzooouhh/Zzooouhh-psy 
Implemented Psychic Battle
 2018-04-28 13:24:58 +02:00
LevelX2
5884dc6533
Merge pull request #4874 from magefree/rystan-atarkamonument 
Update AtarkaMonument.java
 2018-04-28 13:23:41 +02:00
LevelX2
89168723e6 * Added Glarecaster. 2018-04-28 13:22:11 +02:00
LevelX2
29605bc5ae * Redirection effect - Added possibility to last for one applyEffect cycle instead of only one absolute use. 2018-04-28 13:21:58 +02:00
spjspj
1a9f12f576 Increase (by 1/3) the chance of getting either a chaos or planar roll for planechase. 2018-04-28 20:37:19 +10:00
LevelX2
b3d62865d9 * Fixed a problem of deck generator to use cards from sets not legal to the format (fixes #4642). 2018-04-28 01:13:58 +02:00
LevelX2
7e73cf5d34 * Mana Vault - Fixed that it doesn't return mana if payment is cancelled (fixes #4473) 2018-04-28 00:52:04 +02:00
LevelX2
e9db2a68f1 * Greenwarden of Murasa - Fixed "exile if you do" handling (fixes #4475). 2018-04-28 00:31:44 +02:00
LevelX2
59b9449fb9 * Some rework of filter hanmdling. 2018-04-28 00:30:28 +02:00
Evan Kranzler
1583c3af08 updated Warkite Marauder to not use adjustTargets method 2018-04-27 10:08:34 -04:00
spjspj
96f8fb0cb7
Merge pull request #4877 from spjspj/master 
Fix mana dialog box.
 2018-04-27 23:55:40 +10:00
spjspj
843ecddfde Fix mana dialog box. 2018-04-27 23:35:56 +10:00
Michael Simons
7e9e78fee4
Update AtarkaMonument.java 
The turn into a 4/4 dragon ability wasn't working as expected.  It was only turning it into a dragon and giving it flying ability, but the rest of the effects never took place.
 2018-04-27 00:42:21 -04:00
spjspj
26bc78dc8c
Merge pull request #4873 from spjspj/master 
Remove plane from old player and add in new one
 2018-04-27 13:26:20 +10:00
Evan Kranzler
7e5315dbed fixed Overload not working as intended 2018-04-26 20:56:59 -04:00
spjspj
ef281065a8 Remove plane from old player and add in new one 2018-04-27 09:10:02 +10:00
LevelX2
832679c3bf Merge origin/master 2018-04-27 00:42:53 +02:00
LevelX2
9c5b5c6de4 * Path of Ancestry - Fixed that the triggered ability did not work when it was copied by Thespian's Stage (fixes #4464). 2018-04-27 00:42:24 +02:00
L_J
1d822ed8ca
Hall of Gemstone colorless mana interaction fix (fixes #4872) 2018-04-26 22:19:54 +00:00
LevelX2
f4b7a934be * Swaggering Corsair - Fixed that enters the battlefield ability was wrongly implemented as a triggered ability (fixes #4457). 2018-04-26 23:48:03 +02:00
GitHubMage
115309d3ce Merge remote-tracking branch 'upstream/master' 2018-04-26 23:39:00 +02:00
LevelX2
329116669a * Fixed a problem with stack abilities created by Designations eg. Monarch triggered ability (fixes #4457). 2018-04-26 23:35:26 +02:00
LevelX2
c3934ae70b * Ashes to Ashes - Fixed resolution handling e.g. related to Valakut (fixes #4456). 2018-04-26 22:07:37 +02:00
Evan Kranzler
052341f081 fixed Duplicant copying the first thing it exiles rather than the last 2018-04-26 13:21:40 -04:00
Evan Kranzler
1d69c2611d fixed more instances of Kwende, Pride of Femeref not granting double strike 2018-04-26 12:56:27 -04:00
Evan Kranzler
275a70b217 fixed Myr Battlesphere not damaging its defender 2018-04-26 12:36:20 -04:00
LevelX2
90e9a21aa5 * Replaced some wrong card movement handling. 2018-04-26 17:30:44 +02:00
LevelX2
798196c765 * Added Brawl.. /target/ directories to gitignore. 2018-04-26 17:30:28 +02:00
Thomas Contis
a0adf23765 Implemented Cephalid Snitch (Torment) 2018-04-25 19:12:52 -04:00
LevelX2
41e8a0b896 * Oubliette - Fixed some problems, reworked the card. 2018-04-25 23:56:35 +02:00
Evan Kranzler
58d40c8531 changed Slimefoot, the Stowaway 2018-04-25 12:35:17 -04:00