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

23972 commits

This branch
This branch
All branches
Author SHA1 Message Date
GrayedFox
06392f510c
refactor code 
reorder import statemets
tableSeats renamed to jTableSeats to follow naming scheme
setGUISize called sooner (as it is in PlayersChatPanel.java)
 2018-05-20 18:33:06 +02:00
Evan Kranzler
9a7ea91fa0 Fixed Electryte triggered ability 2018-05-20 11:58:56 -04:00
GrayedFox
8ee6c054cd
ignore Atom build config and logs 2018-05-20 17:25:57 +02:00
LevelX2
f7031ccdbe
Merge pull request #4950 from Zzooouhh/Zzooouhh-combat 
Combat fixes for Propaganda and Lure effects
 2018-05-20 10:58:33 +02:00
LevelX2
640ebddcf4
Merge pull request #4939 from magefree/rystan-electryte 
Old card from Urza's Saga: Electryte
 2018-05-20 10:57:42 +02:00
Evan Kranzler
83f1427e9d Updated Scourge of the Throne to match Godo and Aurelia (nonfunctional) 2018-05-19 22:11:25 -04:00
Evan Kranzler
1720b17ebe Fixed Dark Impostor not properly gaining abilities (fixes #4938) 2018-05-19 18:13:51 -04:00
Evan Kranzler
01fb64367e Fixed Godo, Bandit Warlord copies not untapping themselves (fixes #4827) 
Reworked the trigger, also affects Aurelia, the Warleader
 2018-05-19 17:39:20 -04:00
L_J
994771049c
PlayerStub declareBlocker fix 2018-05-19 08:43:42 +00:00
L_J
bd2a2eebf4
TestPlayer declareBlocker fix 2018-05-19 08:42:07 +00:00
L_J
a7d662d73e
Changes to menace & Lure interaction 2018-05-19 08:24:42 +00:00
L_J
1be4379cbd
Some combat fixes 2018-05-19 05:30:11 +00:00
L_J
0512558c60
Some combat fixes 2018-05-19 05:22:50 +00:00
L_J
865624eacd
Some combat fixes 2018-05-19 05:21:09 +00:00
L_J
73106139e5
Merge pull request #57 from magefree/master 
Merge https://github.com/magefree/mage
 2018-05-19 07:18:35 +02:00
Evan Kranzler
e8ee1fc4f9 Implemented Jiang Yanggu 2018-05-18 18:10:57 -04:00
Evan Kranzler
23f396f83d Implemented Mu Yanling 2018-05-18 14:13:16 -04:00
Evan Kranzler
65ce4dc6cd Added Global Series Jiang Yanggu & Mu Yanling to the spoiler 2018-05-18 13:39:08 -04:00
Evan Kranzler
082adcfc75 fixed battlebond land implementation 2018-05-18 12:04:24 -04:00
Evan Kranzler
54bd43b4f6 Implemented Battlebond dual lands 2018-05-18 11:58:53 -04:00
Evan Kranzler
c504df1f64 added Battlebond spoilers 2018-05-18 11:37:02 -04:00
Oleg Agafonov
463e947c00 Added more info to config description 2018-05-18 15:56:45 +04:00
Oleg Agafonov
82fee4e5bd
Merge pull request #4948 from jmharmon/master 
Added new modern deck types from Old School 93/94
 2018-05-18 15:44:34 +04:00
jmharmon
1679672243
Add files via upload 
Adding Old School 93/94 rule variants.
 2018-05-18 03:51:53 -07:00
jmharmon
19c9d7634c
Add files via upload 
Added Old School 93/94 variants for different rules.
 2018-05-18 03:20:22 -07:00
Evan Kranzler
dfa3426f87 fixed Goblin Bushwacker giving haste to noncreature permanents 2018-05-17 21:32:35 -04:00
Evan Kranzler
d36d87eb15 fixed ninjutsu ability being usable after blockers have been removed 2018-05-17 15:41:11 -04:00
Oleg Agafonov
06b3e70d4e Merge remote-tracking branch 'production/master' into production_master 2018-05-17 19:39:38 +04:00
Oleg Agafonov
9d0aff8395 AI: fixed outcome for lose ability effect 2018-05-17 19:32:47 +04:00
Oleg Agafonov
7e08d20f6d Refactoring: replace custom creature tokens with basic class (5 cards) 2018-05-17 19:32:03 +04:00
Evan Kranzler
cf2fc4a815 Merge branch 'master' of https://github.com/magefree/mage 2018-05-17 11:30:10 -04:00
Evan Kranzler
49360f2312 implemented Death-Mask Duplicant 2018-05-17 11:28:41 -04:00
Oleg Agafonov
4940b3a7a4 Fixed typos in new modern no banned list mode; 2018-05-17 19:28:23 +04:00
Evan Kranzler
eedef13c14 implemented Grim Reminder 2018-05-17 11:02:27 -04:00
Evan Kranzler
81b192a42f implemented Defensive Maneuvers 2018-05-16 23:30:33 -04:00
theelk801
6fba02b2b0
Merge pull request #4941 from magefree/fixSagas 
Fixed implementation of sagas to sacrifice at the correct time
 2018-05-16 20:06:06 -04:00
Evan Kranzler
a578f2969f implemented Flayed Nim 2018-05-16 09:39:55 -04:00
theelk801
93b57033b9
Merge pull request #4943 from magefree/master 
merge
 2018-05-16 09:21:36 -04:00
Evan Kranzler
36e46d6363 fixed Azcanta, the Sunken Ruin not allowing players to fail to find 2018-05-16 09:04:34 -04:00
Evan Kranzler
30922924f5 added TheElk801 as a dev 2018-05-15 20:22:05 -04:00
theelk801
9739c0c6f9
Merge pull request #4924 from hooptie45/master 
Added No Banned List Modern format
 2018-05-15 14:21:20 -04:00
LevelX2
049a578f37
Merge pull request #4935 from magefree/rystan-fix-horn 
Fix for Herald's Horn's spell reduction
 2018-05-15 18:04:24 +02:00
LevelX2
e2f22d3bc9 Reworked some card movement handling (#4866). 2018-05-15 17:56:55 +02:00
LevelX2
08b9f61749 Removed wrong import in TestPlayer.java. 2018-05-15 14:31:37 +02:00
Michael Simons
7389a6178a
Update Electryte.java 2018-05-14 23:00:29 -04:00
Evan Kranzler
49c3f94cdb added Mage.Verify/mageclient.log to gitignore 2018-05-14 22:59:25 -04:00
Michael Simons
fd289b023c
Update Electryte.java 
Electryte damage is now done by OneShotEffect derived "ElectryteEffect" so that damage is calculated at time of effect triggering.

Thanks @JayDi85
 2018-05-14 22:57:59 -04:00
Evan Kranzler
ac97e4c600 fixed Sagas being sacrificed before their trigger has left the stack 2018-05-14 17:36:41 -04:00
theelk801
fbde510bac
Merge pull request #4940 from magefree/master 
merge
 2018-05-14 14:08:30 -04:00
Evan Kranzler
342b4486e8 fixed Damping Sphere not reducing sources of conditional mana (such as Eldrazi Temple and Mishra's Workshop) 2018-05-14 13:53:09 -04:00