spjspj
316693c064
Merge pull request #3097 from spjspj/master
...
Minor housekeeping
2017-04-12 21:55:47 +10:00
LevelX2
b5886cca99
Merge pull request #3081 from ThomasLerner/master
...
Ice Cave Implementation
2017-04-12 09:50:40 +02:00
spjspj
2a39a8e5cf
minor housekeeping
2017-04-12 16:07:18 +10:00
spjspj
171c3997e6
minor housekeeping
2017-04-12 16:05:54 +10:00
spjspj
f0fb3692af
Merge pull request #3096 from spjspj/master
...
spjspj - Implement Harsh Mentor (AKH)
2017-04-12 14:16:56 +10:00
spjspj
ea98f96a92
spjspj - Implement Harsh Mentor (AKH)
2017-04-12 14:16:04 +10:00
spjspj
c4c5f86943
Merge pull request #3095 from spjspj/master
...
Amonkhet - Minor housekeeping
2017-04-12 12:26:11 +10:00
spjspj
239d931774
Amonkhet - minor housekeeping
2017-04-12 12:24:21 +10:00
spjspj
d82eeacf4f
Amonkhet - minor housekeeping
2017-04-12 12:17:30 +10:00
spjspj
dc108faf8b
Merge pull request #3094 from spjspj/master
...
Rhonas - fix in mtg-cards-data.txt
2017-04-12 12:14:37 +10:00
spjspj
c5d9daccbe
Rhonas - fix in mtg-cards-data.txt
2017-04-12 12:12:43 +10:00
spjspj
b2fa07462a
Merge pull request #3092 from spjspj/master
...
spjspj - Fix up gen-existing-cards-by-set.pl for handling split cards…
2017-04-12 10:45:57 +10:00
spjspj
83971539d2
spjspj - Fix up gen-existing-cards-by-set.pl for handling split cards (relevant to Amonkhet).
2017-04-12 10:10:33 +10:00
Mark Langen
db74576397
Added 4 cards from AHK
...
* Added Cartouche of Strength
* Added Nest of Scarabs (More correct implementation than existing one)
* Added Soul-Scar Mage
* Added Battlefield Scavenger
2017-04-11 17:40:15 -06:00
Jeff
04f1b6306a
- Added Cruel Reality. <Amonkhet>
2017-04-11 17:53:34 -05:00
fireshoes
923e9818eb
Merge origin/master
2017-04-11 16:15:02 -05:00
fireshoes
20772ff370
Added Legacy Cube April 2017.[AKH] Added 4/11 spoilers to mtg-cards-data.txt.
2017-04-11 16:14:31 -05:00
Jeff
fb923865a8
- Added Watchers of the Dead. <Amonkhet>
2017-04-11 16:14:03 -05:00
Derek M
d7db5b6288
Merge pull request #3090 from Darkside-/master
...
added deem worthy and grim strider to AKH
2017-04-11 16:39:53 -04:00
Timothy Rice
b101492af9
added grim strider to AKH
2017-04-11 15:35:39 -05:00
Timothy Rice
49a37ad804
added deem worthy to AKH
2017-04-11 15:23:04 -05:00
Derek M
a5b32bc181
Merge pull request #3089 from Darkside-/master
...
fixed Mistform creature types and verify test for phyrexian mana
2017-04-11 15:42:23 -04:00
Timothy Rice
89ee5eeeae
fixed Mistform creature types and verify test for phyrexian mana
2017-04-11 13:58:01 -05:00
Styxo
46d44f84e3
[AKH] Added Hapatra, Nest of Scarabs and Throne of the God Pharao and removed redundant code
2017-04-11 15:20:55 +02:00
Styxo
058b9e970c
[AKH] Name fix
2017-04-11 11:57:29 +02:00
Styxo
0d40fccc62
[AKH] Added rest of 4/10 spoilers
2017-04-11 11:07:39 +02:00
ingmargoudt
5dfc0392f9
Merge pull request #3086 from ingmargoudt/play_match_human_fix
...
fixed two lines to allow playing human-human tables
2017-04-11 08:06:15 +02:00
ingmargoudt
fea477dd04
fixed two lines to allow playing human-human tables
2017-04-11 07:54:54 +02:00
Achilles
a08155341e
- Added Vizier of the Menagerie. <Amonkhet>
2017-04-11 00:34:18 -05:00
fireshoes
7da69e5064
Merge origin/master
2017-04-10 18:46:43 -05:00
fireshoes
5fbcf759d6
[ANK] Added 4/10 spoilers to mtg-cards-data.txt and implemented a many cards.
2017-04-10 18:45:48 -05:00
Mark Langen
2b08d5a101
As Foretold Implemented
...
* Final change to card casting code to support as foretold. Removed all of the "Can't cast cards with no mana cost" code from the earlier parts of the casting process and simplified it to just the PlayerImpl::canPlay check and one final check in the main AbilityImpl::activate code after alternative costs have been chosen.
2017-04-10 17:00:27 -06:00
Mark Langen
c22a8f717e
Fix for problem introduced in 321f5597b7
...
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
2017-04-10 16:13:42 -06:00
Mark Langen
b33e03862a
Work in progress changes to support As Foretold
...
* Modifies how cards with no mana cost are handled. You can now begin to cast them if there is an AlternativeCost that would allow you to play them.
2017-04-10 16:13:42 -06:00
Mark Langen
1ce32eb24e
Fix a couple of the perl scripts to work properly with the cards.f.FirstLetter style card class reorg
2017-04-10 16:13:42 -06:00
Jeff
f119965f46
- Fixed cost of Greel, Mind Raker.
2017-04-10 14:53:43 -05:00
ThomasLerner
7a48387635
Fixed not giving counter option to non-opponent players that are not the spell's controller
...
This update brings to code to compliance with LevelX2's reccomendation by using getPlayersInRange(source.getControllerId(), game) and checking manually that the player is not the spell's controller.
2017-04-10 04:39:10 -04:00
ThomasLerner
57b50857cc
Update IceCave.java
...
I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it.
2017-04-09 18:23:34 -04:00
Derek M
db8cfc7978
Merge pull request #3080 from JRHerlehy/master
...
[AKH] Liliana, Death's Majesty
2017-04-09 11:26:59 -04:00
ThomasLerner
d510651bac
Update IceCave.java
2017-04-09 06:34:37 -04:00
ThomasLerner
7a0a7d9a2f
Update Apocalypse.java
...
Added Ice Cave entry
2017-04-09 06:32:43 -04:00
ThomasLerner
77618b7ef5
Create IceCave.java
2017-04-09 06:30:54 -04:00
Justin Herlehy
7ff949d686
[AKH] Liliana, Death's Majesty
...
Corrected reanimation filter to correctly generate mouseover text.
2017-04-08 23:42:03 -07:00
Justin Herlehy
8b1220af66
[AKH] Liliana, Death's Majesty
...
Refactored the "Becomes a black Zombie in addition to its other colors and types" code to own class file to dedupe code from several cards.
2017-04-08 23:25:43 -07:00
Mark Langen
6912e45310
Merge branch 'master' of https://github.com/magefree/mage
2017-04-08 20:03:57 -06:00
Mark Langen
f96a1532bf
Add Approach of the Second Sun [AKH] + test
2017-04-08 20:03:23 -06:00
Derek M
3e552e08cc
Merge pull request #3076 from drmDev/ut/behindscenes
...
#3075 ut does not confirm bug with behind scenes
2017-04-08 13:17:19 -04:00
drmDev
b7c903fc55
#3075 ut does not confirm bug with behind scenes
2017-04-08 13:16:35 -04:00
Mark Langen
321f5597b7
Change main client window MagePanes from JInternalFrames to JLayeredPanes
...
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
2017-04-07 22:08:13 -06:00
LevelX2
fee7e4a4e6
Merge pull request #3071 from ingmargoudt/cleanups
...
Cleanups
2017-04-07 19:41:15 +02:00
