Mark Langen
383bfeb135
Merge branch 'master' of https://github.com/magefree/mage into akh-card-frame
2017-04-04 22:01:01 -06:00
Mark Langen
047449f14e
* Correct type line rendering for split cards with different types on each half.
...
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
2017-04-04 21:58:52 -06:00
fireshoes
4e3d75d937
Merge origin/master
2017-04-04 21:00:03 -05:00
fireshoes
8ff947c6f0
[AKH] Added embalm to the keyword file and card gen script. Implemented the rest of the embalm cards.
2017-04-04 20:57:25 -05:00
Mark Langen
7e3d276c57
Merge pull request #3053 from magefree/akh-card-frame
...
Aftermath Ability and Amonket Aftermath card frame
2017-04-04 18:37:28 -06:00
Mark Langen
a2e8cedd02
Merge branch 'master' into akh-card-frame
2017-04-04 18:36:37 -06:00
Mark Langen
7a6b8a1540
Final Aftermath implementation stuff
...
* Fixed PlayerImpl::getPlayable() to support aftermath (Needs PLAY_FROM_NOT_OWN_HAND_ZONE at the granularity of each card half rather than the whole card)
* Added tests for Dusk // Dawn to make sure there are no regressions on Aftermath.
2017-04-04 18:28:30 -06:00
Mark Langen
fd73fd39af
Addressed Feedback and added cards
...
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
2017-04-04 17:07:59 -06:00
fireshoes
2296647df9
Merge origin/master
2017-04-04 18:02:31 -05:00
fireshoes
195ff7f554
[AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards.
2017-04-04 17:57:08 -05:00
Jeff
796fca7c1b
- Added Charisma.
2017-04-04 17:18:19 -05:00
LevelX2
90b43b5838
Merge pull request #3058 from ingmargoudt/client_callback_enums
...
Client callback enums
2017-04-04 23:40:57 +02:00
Jeff
da34d6c3ca
- Modified set for Bronze Bombshell.
2017-04-04 15:44:42 -05:00
Jeff
b76933d5b3
- Added Bronze Bombshell.
2017-04-04 15:41:48 -05:00
ingmargoudt
c461d67d34
put disconnect reason message in enum
2017-04-04 21:59:26 +02:00
ingmargoudt
ff6d1541c3
clientcallbacks to enums
2017-04-04 21:52:15 +02:00
fireshoes
fe33f82acc
[AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards.
2017-04-04 14:28:45 -05:00
ingmargoudt
0e7604a0cc
Merge pull request #3057 from ingmargoudt/broadcast_fix
...
broadcast fix
2017-04-04 20:42:23 +02:00
ingmargoudt
f04fecf7a6
broadcast fix
2017-04-04 20:40:37 +02:00
LevelX2
e42d195f8d
[AKH] Added Anoiter Priest and embalm ability.
2017-04-04 17:55:37 +02:00
Derek M
9019f82023
Merge pull request #3056 from drmDev/ut/vex-redirect
...
#3048 unit test for vexing devil redirect planeswalker interaction. u…
2017-04-04 10:50:48 -04:00
Derek Monturo
eec4c07726
#3048 unit test for vexing devil redirect planeswalker interaction. unable to duplicate issue
2017-04-04 10:50:14 -04:00
LevelX2
5952c5e33a
* Fixed a bug that mana pool was carried over to next game (e.g. using Savage Ventmaw).
2017-04-04 16:23:10 +02:00
LevelX2
269189f87e
Merge origin/master
2017-04-04 15:33:01 +02:00
LevelX2
45818f3a51
* Celestial Dawn - Fixed that it was not possible to pay colorless costs with non white mana.
2017-04-04 15:32:39 +02:00
Jeff
772fff4f66
- Fixed spelling for Event.
2017-04-04 08:24:30 -05:00
LevelX2
989250c7f6
Added missing player type.
2017-04-04 09:21:14 +02:00
Mark Langen
18663f0a7a
Amonket Aftermath ability and card frame changes Completed
...
* Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work)
* Aftermath Card Frame rendering complete
* Normal Split and Fuse Split card frame rendering complete
* Amonket Split card CMC changes NOT made, but left for a separate commit
2017-04-04 00:29:54 -06:00
fireshoes
a04bbce5db
[AKH] Added 4/3 spoilers and implemented several.
2017-04-03 23:52:39 -05:00
Mark Langen
a96a7f89f5
Work in progress changes for Amonket Aftermath ability.
...
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
2017-04-03 04:15:25 -06:00
LevelX2
e88613da5c
* Kira, Great Glass-Spinner - Fixed that targeting objects that later changed to creatures was ignored (related to #3041 ).
2017-04-03 10:30:28 +02:00
LevelX2
b5dc463789
Merge pull request #3052 from ingmargoudt/cleanups
...
playertype, enum singleton
2017-04-03 00:32:43 +02:00
ingmargoudt
211d433ea9
playertype, enum singleton
2017-04-02 22:09:20 +02:00
Derek M
b19170f34f
Merge pull request #3045 from SickBoyWi/master
...
Implemented Soul Burn card for the two sets it's a part of: Ice Age a…
2017-04-02 12:17:32 -04:00
Johnny.Hastings@gmail.com
675c3346ac
Removed duplicate line in SoulBurn, used correct reference to Soul Burn as [this] in SoulBurnEffect.
2017-04-02 10:17:39 -05:00
Achilles
9b6151e835
- Fixed Thran Turbine. Bug #3051 .
2017-04-02 09:47:27 -05:00
LevelX2
097a8ce0dd
Some rework to end turn logic and removing of stack objects (related to #2977 ).
2017-04-02 15:18:50 +02:00
LevelX2
2446abcc98
* Some minor changes to sleep command.
2017-04-02 11:48:05 +02:00
LevelX2
5a072ea760
* Some minor changes to sleep command ( fixes #2992 ).
2017-04-02 11:32:25 +02:00
LevelX2
4c35650b2b
* Fixed a problem that chat messages were no longer broadcast ( fixes #3050 ).
2017-04-02 10:51:00 +02:00
LevelX2
15c1c7f8c0
* Fixed a problem with flashback ability and variable non mana costs (related to #2436 ).
2017-04-02 10:11:25 +02:00
LevelX2
a49f79cfc3
* Fixed a problem with replacement effects that add counters were applied more than once to the same EnteresTheBattlefield event ( fixes #2872 ).
2017-04-02 09:46:17 +02:00
ingmargoudt
416210f240
Merge pull request #3049 from ingmargoudt/optionals
...
rewrote some streams and optionals
2017-04-01 23:09:28 +02:00
ingmargoudt
594ffa2754
rewrote some streams and optionals
2017-04-01 22:45:40 +02:00
LevelX2
d0bf77cedf
* Fixed a problem with replacement effects that add counters were applied more than once to the same EnteresTheBattlefield event ( fixes #2872 ).
2017-04-01 17:43:17 +02:00
Johnny.Hastings@gmail.com
2be3f20320
Implemented Soul Burn card for the two sets it's a part of: Ice Age and Invasion.
2017-03-31 18:33:17 -05:00
LevelX2
94f77675ec
* Reverted NykthosDevotion test commented out lines.
2017-04-01 00:53:47 +02:00
ingmargoudt
884ae83791
Merge pull request #3042 from ingmargoudt/card_functions
...
move static function to CardImpl, and other api fixes
2017-03-31 18:52:37 +02:00
fireshoes
e70e7daa0f
[AKH] Added cycling duals and basics.
2017-03-31 11:25:36 -05:00
Jeff
38a04fda37
- Added Myr Incubator.
2017-03-31 11:19:30 -05:00
