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

23588 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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