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

14268 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
3f57012c85 Merge origin/master 
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
 2016-03-03 23:22:06 +01:00
LevelX2
c3f32a39bd Merge. 2016-03-03 23:19:45 +01:00
rkfg
e8091daea5 Reverted crlf's back. 2016-03-04 01:13:27 +03:00
LevelX2
4f4cf16200 Merge pull request #1578 from fenhl/wild-pair 
Implement Wild Pair
 2016-03-03 23:12:26 +01:00
LevelX2
23518b16f5 Merge pull request #1582 from GitHubMage/master 
fixed Ali from Cairo
 2016-03-03 23:12:05 +01:00
LevelX2
be33af6101 Merge pull request #1585 from drmDev/master 
Reflector Mage tests and updated SkylineCascade test
 2016-03-03 23:10:05 +01:00
rkfg
b9bbf9ccec Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 01:06:53 +03:00
rkfg
47b2a64cee Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 00:59:12 +03:00
drmDev
95d9191236 Fixed SkylineCascade Test usage of addTarget 2016-03-03 15:05:27 -05:00
rkfg
9cf972ced4 Faster symbols load. 2016-03-03 23:04:35 +03:00
drmDev
b46c2d5b45 testReflectorMageBouncesFaceupCreatureReplayAsMorph fails due to bug reported 2016-03-03 14:50:00 -05:00
rkfg
e2b62fecd8 Prevent repeatable conceding (fixes #1526). 2016-03-03 19:03:37 +03:00
LevelX2
527bb2a492 Modified Blood Moon test. 2016-03-03 10:21:11 +01:00
LevelX2
beb257c081 Merge pull request #1583 from drmDev/master 
tests for Blood Moon and Pithing Needle interactions
 2016-03-03 09:21:04 +01:00
drmDev
db2784ff5d Tests for reported bug on Skyline Cascade. 2016-03-02 22:29:42 -05:00
drmDev
50e1828d41 tests for Blood Moon and Pithing Needle interactions 2016-03-02 19:33:51 -05:00
rkfg
89bce030d0 Add colorless mana filter to deck generator. 2016-03-03 00:39:58 +03:00
rkfg
6cfe43e9b7 Make DeckGeneratorDialog fields non-static for more OOP-style. 2016-03-03 00:39:57 +03:00
GitHubMage
a5504c1a96 fixed Ali from Cairo 
the previous implementation did reduce the amount of damage that is being dealt to not reduce life below one.
now the damage is untouched but the affected player's life total is set to 1 if the damage would otherwise reduce below 1.
 2016-03-02 22:29:29 +01:00
LevelX2
d481c124ea [SOI] Added Eerie Interlude and Stiched Mangler. 2016-03-02 19:46:10 +01:00
LevelX2
67c951888e Merge pull request #1576 from drmDev/master 
Dread Cacodemon card implementation with ConditionalTriggeredAbility
 2016-03-02 17:11:29 +01:00
drmDev
ff0dbba539 tooltip change to include when {this} enters the battlefield 2016-03-02 07:46:02 -05:00
LevelX2
afe0819549 Merge pull request #1579 from rkfg/master 
Fix first card tooltip show.
 2016-03-02 13:19:00 +01:00
rkfg
5b9a38bf22 Fix first card tooltip show. 2016-03-02 14:48:57 +03:00
Fenhl
bfb97672bb Implement Wild Pair 2016-03-02 06:29:03 +00:00
drmDev
a9214e6d35 unit tests for Dread Cacodemon Cast from hand and Not Cast from hand 2016-03-01 18:45:21 -05:00
drmDev
dcb9a7122b DreadCacodemon card with ConditionalTriggeredAbility 2016-03-01 17:26:46 -05:00
LevelX2
385313bd64 Fixed error of CastFromHandCondition. 2016-03-01 21:41:05 +01:00
LevelX2
6299425c1d Fixed error of CastFromHandCondition. 2016-03-01 21:38:52 +01:00
LevelX2
ad49eeb4ea Fixed error of CastFromHandCondition. 2016-03-01 21:18:53 +01:00
LevelX2
c83e1f29d3 Merge pull request #1572 from spjspj/master 
spjspj - Implement Vesuvan ShapeShifter (TimeSpiral)
 2016-03-01 17:09:57 +01:00
LevelX2
570a6d92dc Foxed some EntersBattlefieldTriggeredAbilities with Intervening-If-Clause not handled correctly. 2016-03-01 17:00:02 +01:00
LevelX2
b19b43c4c8 * Scion of Vitu-Ghazi - Fixed that conditional trigger was not handled correctly. 2016-03-01 15:39:37 +01:00
LevelX2
5b15f96342 Fixed some problems of CastFromHandCondition. 2016-03-01 15:38:50 +01:00
LevelX2
0e2e4ccedd * Crib Swap - Fixed that the created token was ehite instead of colorless. 2016-03-01 15:36:23 +01:00
LevelX2
f3eafd11e5 Merge pull request #1571 from rkfg/master 
Fix issues with brand new installation, add Generate button to Deck Editor, show card tooltips in logs
 2016-03-01 09:45:40 +01:00
spjspj
b737f3bf8a spjspj - Implement Vesuvan ShapeShifter (TimeSpiral) 2016-03-01 12:36:22 +11:00
rkfg
ba0cd24b55 Show card tooltips in system logs. 2016-03-01 01:12:57 +03:00
rkfg
abff5c1958 Filter HTML in ability picker. 2016-02-29 20:53:03 +03:00
rkfg
f7314307a6 Reload symbols after closing the symbols download window (better UX). 2016-02-29 20:08:52 +03:00
rkfg
f00a588e24 Add Generate button to Deck Editor. 2016-02-29 19:40:00 +03:00
rkfg
3658a8c7bc Prevent NPE if client never connected to any server and doesn't have 
sets downloaded.
 2016-02-29 19:39:59 +03:00
LevelX2
9da86fefad Merge pull request #1570 from djbrez/patch-9 
Create PitSpawn.java
 2016-02-29 11:08:53 +01:00
DjB
87e2cd68c1 Create PitSpawn.java 2016-02-28 22:48:57 -06:00
LevelX2
075932e1b0 [SOI] Added Invasive Surgery. 2016-02-29 01:19:13 +01:00
LevelX2
3fbe5f42bd Merge pull request #1569 from djbrez/patch-8 
Create LiegeOfThePit.java
 2016-02-29 01:18:01 +01:00
DjB
182a38b658 Create LiegeOfThePit.java 2016-02-28 17:23:45 -06:00
LevelX2
5e907852e7 Merge pull request #1568 from djbrez/patch-7 
Create MetalFatigue.java
 2016-02-28 19:03:03 +01:00
LevelX2
739b7d6535 Added a test for Serra Ascendant and Commander FFA. 2016-02-28 19:00:41 +01:00
LevelX2
f53daaaf94 Xmage 1.4.9v1 2016-02-28 18:39:21 +01:00