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
23603 commits 2 branches 0 tags 782 MiB
Commit graph

23603 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
a063889205 Merge origin/master 2018-05-03 01:33:39 +02:00
LevelX2
cddd81123b Some changes related to #4893. 2018-05-03 01:33:21 +02:00
Evan Kranzler
75bef57832 fixed Lich's Mastery preventing auto-win effects 2018-05-02 18:34:22 -04:00
Evan Kranzler
4bc0ba8509 fixed Dauntless Bodyguard not giving indestructible 2018-05-02 18:13:34 -04:00
Evan Kranzler
9b5b3afcb8 fixed Teferi, Hero of Dominaria's untap trigger 2018-05-02 17:42:41 -04:00
Evan Kranzler
8c8b6c99cc fixed Karplusan Hound damaging everything 2018-05-02 17:23:06 -04:00
LevelX2
9919a3403d * Wall of Deceit - Fixed not working "Turn face down" ability. 2018-05-02 17:32:59 +02:00
Evan Kranzler
c824d012d1 implemented Mask of the Mimic 2018-05-02 09:26:37 -04:00
Oleg Agafonov
b6bad9ca96 * Fixed viewer's error on tokens show up (Mirage and other); Fixed some tokens. 2018-05-02 15:16:39 +04:00
spjspj
4b4d7989cd
Merge pull request #4879 from spjspj/master 
Add planechase to new tournament window as well.
 2018-05-02 18:31:59 +10:00
Oleg Agafonov
3549f958d4 Fixed NPE in Riptide Replicator and Volraths Laboratory tokens 2018-05-02 00:17:55 +04:00
Oleg Agafonov
4d31294ee9 Refactor images path code 2018-05-02 00:16:41 +04:00
L_J
58a829de0e
Implemented old cards 2018-05-01 02:07:45 +02:00
LevelX2
e767c79429 XMage 1.4.29V4 2018-05-01 01:20:52 +02:00
L_J
196e428f7b
Merge pull request #54 from magefree/master 
Merge https://github.com/magefree/mage
 2018-05-01 01:12:38 +02:00
LevelX2
480671dd4d Merge origin/master 2018-05-01 01:12:20 +02:00
LevelX2
a84dc233c3 * Cleaned up some unnecessary checks for FlashbackAbility due to the old Flashback implementation. 2018-05-01 01:11:47 +02:00
LevelX2
62a17b4841
Merge pull request #4786 from Zzooouhh/Zzooouhh-ice 
Implemented Ice Cauldron
 2018-05-01 01:00:26 +02:00
LevelX2
c7f23a8ba4 Merge origin/master 2018-05-01 00:56:15 +02:00
LevelX2
0ceb5fc88f * Drain Power - Improved conditonal mana handling. 2018-05-01 00:55:46 +02:00
L_J
b8357d54eb
Ice Cauldron MageObjectReference stack tracing fix 2018-04-30 22:19:25 +00:00
Oleg Agafonov
a69aac2243 Fixed tests and exceptions in AI choose target code 2018-05-01 01:34:24 +04:00
LevelX2
940fe603c6 * Herald's Horn - Fixed that cast cost reduction was also applied to other players. 2018-04-30 23:15:48 +02:00
LevelX2
f27f32ec5e
Merge pull request #4880 from Zzooouhh/Zzooouhh-drain 
Implemented Drain Power (with bugs)
 2018-04-30 22:43:00 +02:00
LevelX2
828b43bf74 Merge origin/master 2018-04-30 22:29:19 +02:00
LevelX2
bba243c748 * Elderwood Scion - Fixed that second static ability causing game exceptions. 2018-04-30 22:28:34 +02:00
LevelX2
f3890daaab
Merge pull request #4886 from GitHubMage/master 
"Fixing" previous AliFromCairo fix
 2018-04-30 18:51:11 +02:00
LevelX2
bdb0254274 Added 3 AI suitable decks. 2018-04-30 17:21:36 +02:00
LevelX2
a05726cdee * Replaced some more wrong card movement handling. 2018-04-30 16:58:22 +02:00
LevelX2
11be86c208 Merge origin/master 2018-04-30 15:52:35 +02:00
LevelX2
d535dba253 * Scourge of Valkas - Fixed damage source handling. 2018-04-30 15:50:37 +02:00
spjspj
48de177f75
Merge pull request #4881 from brikr/patch-1 
Fix Brawl.java banlist comments
 2018-04-30 20:27:17 +10:00
LevelX2
dc91d6ff81 * Some updated to Psychic Battle handling. 2018-04-30 08:06:23 +02:00
LevelX2
ec96f8a18e * AI - Improved nadling of target selection if AI doe smot control the ability itself. 2018-04-30 08:05:17 +02:00
GitHubMage
858362a7b4 minor adjustment to previous fix for AliFromCairo 2018-04-29 17:49:18 +02:00
spjspj
1dbffe70b5 Add planechase to tournaments 2018-04-29 23:47:08 +10:00
GitHubMage
c1ec4f8ef4 Merge remote-tracking branch 'upstream/master' 2018-04-29 14:36:00 +02:00
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