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

16162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eirkei
0c2e02ec62 Tangleroot implemented 2016-09-26 13:03:19 +02:00
Lymia Aluysia
f61c18ea63
Fix code formatting issue. 2016-09-26 05:19:40 -05:00
LevelX2
3c93c00d60 * Nature's Way - Fixed wrong damage source (fixes #2378). 2016-09-26 12:09:06 +02:00
LevelX2
e552d64764 Merge pull request #2372 from Eirkei/master 
Shaleskin Bruiser implemented
 2016-09-26 11:38:49 +02:00
spjspj
3e68a1d9a7 Merge pull request #2377 from spjspj/master 
spjspj - Add in energy/experience counters
 2016-09-26 10:05:51 +10:00
Lymia Aluysia
48e14a1765
Rename stuff. Names are hard. 2016-09-25 14:45:06 -05:00
Lymia Aluysia
207cb04dbc
Merge branch 'master' of https://github.com/magefree/mage 2016-09-25 14:09:42 -05:00
Lymia Aluysia
2c0cb3f317
Added customSets to gitignore 2016-09-25 13:39:15 -05:00
Styxo
f18e4b66f1 Little refactor of PermanentHasCounterCondition 2016-09-25 19:38:40 +02:00
Lymia Aluysia
2fec14f8fa
Minor error message fix. 2016-09-25 12:36:59 -05:00
spjspj
1a81f2151f spjspj - Add in energy/experience counters 2016-09-26 03:17:06 +10:00
spjspj
e6a258dd63 Merge pull request #2376 from spjspj/master 
spjspj - Add in energy/experience counters
 2016-09-26 03:02:10 +10:00
spjspj
d259efc093 spjspj - Add in energy/experience counters 2016-09-26 03:01:35 +10:00
spjspj
ffa7d38aed Merge pull request #2375 from spjspj/master 
spjspj - experience.png resource (candidate for a more gooderer one..)
 2016-09-26 02:59:32 +10:00
spjspj
5671ab8ff7 spjspj - Add in energy/experience counters 2016-09-26 02:58:59 +10:00
spjspj
db3074ceda spjspj - experience.png resource (candidate for a more gooderer one..) 2016-09-26 02:50:37 +10:00
spjspj
367333ddc8 Merge pull request #2374 from spjspj/master 
spjspj - Energy.png resource
 2016-09-26 02:46:05 +10:00
spjspj
80b498f044 spjspj - Energy.png resource 2016-09-26 02:45:20 +10:00
Lymia Aluysia
e606deded8
Make ClassScanner not load inner classes. 2016-09-25 10:40:40 -05:00
Eirkei
c4ebb2f7e5 Marton Stromgald implementation - fix setting lockedInPT 2016-09-25 10:42:59 +02:00
Lymia Aluysia
51b9d5ba38
Improved debug output slightly. 2016-09-24 17:34:30 -05:00
Lymia Aluysia
e5af2b843b
Move the custom set flag to setType. 2016-09-24 17:03:04 -05:00
Eirkei
1ae166bcfc Marton Stromgald implementation - fix name in comment 2016-09-24 23:36:29 +02:00
Lymia Aluysia
d678fc1a59
Add custom set loader code. 2016-09-24 15:16:20 -05:00
Eirkei
bb0fae82b7 Marton Stromgald implemented 2016-09-24 21:57:34 +02:00
Lymia Aluysia
74a017586a
Exclude custom sets from constructed formats. 2016-09-24 14:15:47 -05:00
eirkei
92b8057e6c Shaleskin Bruiser implemented 2016-09-24 20:15:25 +02:00
Lymia Aluysia
238c88a8b6
Added mechanic for CardImpl to search other classloaders for cards. 2016-09-24 12:33:47 -05:00
Eirkei
738c11a0e3 Merge pull request #1 from magefree/master 
Merge magefree/mage
 2016-09-24 19:26:43 +02:00
Lymia Aluysia
ad5b23aa06
Made CardScanner classloader aware. 2016-09-24 12:14:20 -05:00
Lymia Aluysia
3c2dd8d335
Made ClassScanner classloader aware. 2016-09-24 11:31:26 -05:00
Lymia Aluysia
14f97ba24a
Added plugin events. 2016-09-24 10:27:36 -05:00
spjspj
70dd42fc7c Merge pull request #2371 from spjspj/master 
spjspj - Add in option of having multi-seat tables for tournaments
 2016-09-25 00:53:46 +10:00
spjspj
74503a1493 spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:48:41 +10:00
spjspj
16bb17e5bb spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:46:16 +10:00
LevelX2
101a1db649 Xmage 1.4.15v5 2016-09-24 14:55:18 +02:00
LevelX2
b85dc8c0cd Some minor changes. 2016-09-24 14:55:09 +02:00
LevelX2
73a2ccda9b Xmage 1.4.15v5 2016-09-24 04:01:00 +02:00
LevelX2
e81f26d539 Some fixes to prevent null pointer exceptions. 2016-09-24 03:48:48 +02:00
LevelX2
1ccd2a1b04 Some fixes to prevent null pointer exceptions. 2016-09-24 03:36:18 +02:00
Samuel Sandeen
ad2f5a4d46 Merge pull request #2368 from Dilnu/master 
Fix Flashback so it can't cause Stack Overflows
 2016-09-23 21:25:43 -04:00
Dilnu
396f3b73b1 Propagate Applied Effects with the Flashback Replacement Effect 
This fixes a bug that allows replacement loops when other replacement
effects conflict with Flashback’s attempts to exile Flashbacked spells.
 2016-09-23 21:19:51 -04:00
LevelX2
423c2bbf6c Fixed a problem of Flashback and Buyback producing a loop. 2016-09-24 03:13:59 +02:00
Dilnu
b7f9626697 Small fixes to TriggeredAbilityImpl 
This fixes a type and removes a duplicate null check.
 2016-09-23 21:13:34 -04:00
Dilnu
eaa2d71a37 Merge branch 'magefree/master' 2016-09-23 21:11:42 -04:00
LevelX2
5215a02181 Minor change. 2016-09-24 02:22:21 +02:00
LevelX2
d5d00451a8 Fixed a problem with static abilities for battlefield zone where the source was entering the battlefield but the ability did not work. 2016-09-24 01:13:13 +02:00
LevelX2
c9bb0be016 Reworked selected modes handling. That fixed the Subtle Strike targeting problem. 2016-09-24 01:12:01 +02:00
LevelX2
0b118d074e * Demonic Pact - Fixed that the already chosen options were not correctly rollbacked. 2016-09-23 19:10:25 +02:00
LevelX2
f845ca083c Merge pull request #2365 from Eirkei/master 
Krosan Drover implemented
 2016-09-23 15:13:49 +02:00