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

25566 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
2429425fd2 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/s/SalvageTrader.java
	Mage.Sets/src/mage/cards/t/ThermalDetonator.java
 2018-08-15 10:51:21 +02:00
LevelX2
9545ab055d Moved predicate to framework. 2018-08-15 10:47:31 +02:00
LevelX2
4cce091dc2 Reworked Salvage Trader. 2018-08-15 10:46:15 +02:00
LevelX2
fb800c66bc Thermal Detonator fixed filter handling. 2018-08-15 10:09:36 +02:00
LevelX2
35c77a1e5f Some minor rework of Tuvasa the Sunlit. 2018-08-15 10:06:54 +02:00
Oleg Agafonov
bcb7b7593d
Merge pull request #5222 from JayDi85/production_master 
Fixed compilation errors
 2018-08-15 11:58:22 +04:00
Oleg Agafonov
f5093dfe8e Fixed compilation errors (junky filter in Salvage Trader, fix in Thermal Detonator); 2018-08-15 11:38:28 +04:00
LevelX2
1322bd3c23
Merge pull request #5209 from tamaroth/master 
Fix Tuvasa the Sunlit triggered ability.
 2018-08-15 08:52:34 +02:00
LevelX2
d41cf485a9
Merge pull request #5195 from credman0/AminatousAugur 
Implemented Aminatou's Augury
 2018-08-15 08:46:50 +02:00
LevelX2
1c964ca0d0
Merge branch 'master' into AminatousAugur 2018-08-15 08:46:37 +02:00
LevelX2
21b67af7f5
Merge pull request #5213 from rkfg/master 
Perform the action on double click in the game list.
 2018-08-15 08:20:00 +02:00
LevelX2
dbb25c8683
Merge pull request #5202 from credman0/PhasedOutRemoveFromCombatFix 
Fixed phased out creatures not removed from combat (#5200)
 2018-08-15 08:17:58 +02:00
LevelX2
6712e50146
Merge pull request #5196 from credman0/EmissaryOfGrudges 
Implemented Emissary of Grudges
 2018-08-15 08:17:16 +02:00
LevelX2
3abd153de0
Merge pull request #5194 from magefree/rystan-patch-3 
Fix Field of Ruin search logic
 2018-08-15 08:16:46 +02:00
LevelX2
51a93a01a2
Merge pull request #5193 from magefree/rystan-patch-2 
Fumble effect not working per #5155 feedback
 2018-08-15 08:14:42 +02:00
LevelX2
e516430aad
Merge pull request #5187 from jesusjbr/master 
Xantcha, Sleeper Agent implemented.
 2018-08-15 08:14:07 +02:00
LevelX2
94e265f396
Merge pull request #5185 from credman0/master 
Aminatou, the Fate Shifter minor fix - can be commander and author info
 2018-08-15 08:13:43 +02:00
LevelX2
8e040841a9
Merge pull request #5182 from Dilnu/Spell 
Add methods to get information about potential spells.
 2018-08-15 08:11:49 +02:00
LevelX2
6e242fb11f
Merge pull request #5178 from magefree/yuriko 
Implemented Yuriko, the Tiger's Shadow
 2018-08-15 08:09:40 +02:00
LevelX2
a30ed4fee5
Merge pull request #5157 from ninthworld/master 
Add Star Wars Expansion sets to the Star Wars set
 2018-08-15 08:09:19 +02:00
LevelX2
fa13786fab
Merge pull request #5053 from Sedictious/Battlebond_Boos 
Fix Battlebond Partner distribution
 2018-08-15 08:09:03 +02:00
Oleg Agafonov
5f8936f016
Merge pull request #5221 from Dilnu/Artifact 
Remove an extra incorrect check in ArtifactSourcePredicate
 2018-08-15 07:46:50 +04:00
dilnu
973c2a08e3 Remove an extra incorrect check in ArtifactSourcePredicate 2018-08-14 23:45:08 -04:00
Oleg Agafonov
593df43758 Refactoring: replace custom creature tokens with basic class (1 card); 
Added blink test;
 2018-08-15 06:47:33 +04:00
Oleg Agafonov
3da2f98eac Fixed predicate refactor at #5161; 
* Interdict, Ouphe Vandals - fixed that it catch triggered + activated, but must only activated;
 2018-08-15 06:29:06 +04:00
Samuel Sandeen
a94dbe1c9d
Fix a bug with Tawnos Urza's Apprentice caught by the predicate refactor (#5220) 2018-08-14 22:22:48 -04:00
dilnu
c4a68f23ec Update a comment. 2018-08-14 21:26:44 -04:00
Oleg Agafonov
a68667e582
Merge pull request #5161 from Dilnu/Kindred 
Make the type checking on predicates added to filters stricter
 2018-08-15 04:41:27 +04:00
rkfg
18dbd06450 Perform the action on double click in the game list. 2018-08-11 23:55:19 +03:00
quercitron
db2db4c27a
Merge pull request #5212 from magefree/5189-recast-spells-keep-their-previous-targets 
Fix that cards that are cast using alternative cost effects keep their previous targets
 2018-08-11 02:48:07 +03:00
quercitron
3951a48f57
Merge pull request #5211 from elliott-king/master 
Updated a few cards to reflect "target player/opponent or planeswalker".
 2018-08-10 04:00:18 +03:00
Quercitron
e3a33e5894 Fix that cards that are cast using alternative cost effects keep their previous targets (#5189) - Always copy ability on cast. 2018-08-10 02:54:50 +03:00
Quercitron
22de85aee1 Cards that are cast using alternative cost effects keep their previous targets (#5189) - Add unit test. 2018-08-10 02:53:38 +03:00
elliott-king
8b475bbca5 Update a few cards to reflect "target player/opponent or planeswalker" 2018-08-08 21:03:25 -04:00
tamaroth
fc3b3de4ce Fix the triggered ability of Tuvasa the Sunlit to only trigger once. 
Tuvasa's ability should only trigger once a turn when an enchantment spell is being 
cast. For all the subsequent spells the ability should not be triggered.
 2018-08-08 12:04:52 +02:00
tamaroth
566caedd61 Add a test for a triggered ability of Tuvasa the Sunlit 
The test makes sure that a triggered ability of Tuvasa is triggered only once and 
draws only one card when more than one enchantment spells are cast by the 
controller of Tuvasa during a single turn.
 2018-08-08 12:04:52 +02:00
Jeff
d8f9c4b329 - Added requested cards Damping Engine and Keeper of the Mind. 2018-08-07 15:39:01 -05:00
spjspj
824637d33e
Merge pull request #5207 from spjspj/master 
Update Penny Dreadful
 2018-08-08 00:10:45 +10:00
spjspj
589a542cbc Update Penny Dreadful 2018-08-08 00:09:03 +10:00
LevelX2
7f4573f8ce Added some sets to the download sources. 2018-08-07 00:14:22 +02:00
Colin Redman
9adfa96667 Fixed phased out creatures not removed from combat (#5200) 2018-08-05 17:13:42 -06:00
elliott-king
84a05f90a2 Update Eternal Flame to match Oracle text. 2018-08-05 16:37:10 -04:00
dilnu
3e0a92fed8 Fix a typo 2018-08-04 22:42:22 -04:00
Colin Redman
8540f4c03b Made land into play effect optional 2018-08-04 17:01:49 -06:00
Colin Redman
53f68197aa Changed to stream, and removed prompt when there is only a single type 2018-08-04 16:34:30 -06:00
igoudt
cba7da020e Merge branch 'master' of https://github.com/magefree/mage 2018-08-04 20:29:49 +02:00
igoudt
d19aa45e89 fix Bonfire of the Damned and Rakdoss Return to be able to target planeswalkers 2018-08-04 20:29:39 +02:00
ingmargoudt
67d531a821
Merge pull request #5192 from magefree/rystan-patch-1 
Venomspout Brackus ability damage doesn't match card text
 2018-08-04 20:11:54 +02:00
spjspj
4fe1153f29
Merge pull request #5198 from spjspj/master 
Slight Revert
 2018-08-04 01:20:08 +10:00
spjspj
6cb700dc42 Slight Revert 2018-08-04 01:18:07 +10:00