ninthworld
86107de54e
Merge remote-tracking branch 'upstream/master'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-07-16 21:16:20 -07:00
ninthworld
f31bfa829e
add Star Wars expansion sets to the Star Wars set
2018-07-16 20:55:05 -07:00
igoudt
6dce0c26f3
fix some his or her to their
2018-07-09 21:25:04 +02:00
igoudt
c456a1961e
add more isActivePlayer and isAttachedTo calls
2018-07-09 21:25:04 +02:00
Noah Gleason
c91e56b937
Fix Rite of Belzenlok token not damaging its controller
2018-07-08 22:01:37 -04:00
ingmargoudt
e86791cf44
Merge pull request #5112 from NoahGleason/aetherflame-wall
...
Implement Aetherflame Wall
2018-07-08 22:28:11 +02:00
igoudt
d6450eed94
change enum comparison
2018-07-08 13:11:39 +02:00
Quercitron
36c004122a
Fix dual lands generation in the Core Set 2019 boosters
2018-07-08 01:19:49 +03:00
Evan Kranzler
d7914bca44
fixed Tezzeret, Artifice Master emblem not triggering
2018-07-06 09:46:59 -04:00
Evan Kranzler
c169f07833
fixed Ajani, Adversary of Tyrants emblem not triggereding ( fixes #5115 )
2018-07-06 09:20:29 -04:00
Noah Gleason
1f7c7e90b2
Implement Aetherflame Wall
2018-07-05 21:35:56 -04:00
Evan Kranzler
6c000d9177
fixed Rowan Kenrith emblem not triggering ( fixes #5109 )
2018-07-04 22:59:32 -04:00
igoudt
9f06046f22
add isOwned and isControlled methods. remove some null-checks, remove some unnecessary casts
2018-07-04 14:24:11 +02:00
igoudt
dcb1affb9d
use isActivePlayer where possible, some minor text fixes
2018-06-29 21:18:05 +02:00
igoudt
ca1ebeb55e
add method Game.isActivePlayer(UUID playerId)
2018-06-29 14:59:11 +02:00
Evan Kranzler
2b78716a1b
fixed Young Pyromancer text
2018-06-28 09:06:51 -04:00
Noah Gleason
cf571122ea
Allow activating equip ability
2018-06-25 22:36:49 -04:00
Noah Gleason
324ff4a3b8
Implement Serra Inquisitors
2018-06-25 21:58:26 -04:00
Evan Kranzler
8b37c778f0
fixed Rush of Knowledge counting all permanents ( fixes #5069 )
2018-06-25 08:26:28 -04:00
theelk801
b1be4ad7d5
Merge branch 'master' into giant-oyster
2018-06-24 22:24:25 -04:00
theelk801
355a3ab281
Merge pull request #5063 from NoahGleason/jovens-ferrets
...
Implement Joven's Ferrets
2018-06-24 21:53:40 -04:00
Evan Kranzler
087e58383a
fixed Alpine Moon causing a rollback
2018-06-24 21:27:10 -04:00
LevelX2
ca21f32009
Xmage 1.4.30V6
2018-06-24 21:26:52 +02:00
LevelX2
99cfd86533
* Some more fixes for ManaOptions #5023
2018-06-24 18:11:17 +02:00
theelk801
235974f21a
Merge pull request #5067 from NoahGleason/delirium
...
Implement Delirium
2018-06-23 21:43:57 -04:00
Evan Kranzler
c637857480
Added null detection to MageObjectReference
2018-06-23 21:39:36 -04:00
LevelX2
da92cd745e
* Some rework/fixes/optimizations of calculation of available mana.
2018-06-24 01:27:42 +02:00
LevelX2
fdddbbbbe6
* Some rework/fixes/optimizations of calculation of available mana.
2018-06-24 01:23:49 +02:00
Noah Gleason
b97719fbb6
Add Delirium, not recognized as a card
2018-06-23 17:30:57 -04:00
theelk801
c4d9bfe554
Merge pull request #5047 from NoahGleason/mourners-shield
...
Implement Mourner's Shield
2018-06-23 13:38:06 -04:00
Noah Gleason
c78cbc40eb
Fix Heat Stroke
2018-06-23 11:11:35 -04:00
theelk801
42354c1583
Merge pull request #5049 from NoahGleason/neurok-transmuter
...
Implement Neurok Transmuter
2018-06-22 17:57:45 -04:00
Noah Gleason
f7e7db4edc
Fully implement Giant Oyster
2018-06-22 15:54:31 -04:00
Evan Kranzler
266a7cdb85
Implemented Transmogrifying Wand
2018-06-22 08:44:15 -04:00
Evan Kranzler
592362a258
Implemented Tezzeret, Artifice Master
2018-06-21 22:59:29 -04:00
Evan Kranzler
36e5bd3a1d
Implemented Thorn Lieutenant
2018-06-21 19:59:26 -04:00
LevelX2
e04c132dfe
Xmage 1.4.30V5
2018-06-21 23:13:17 +02:00
LevelX2
46d61a1ebc
Fixed some possible exceptions.
2018-06-21 22:49:15 +02:00
LevelX2
083d4cee6d
Fixed possible static filter manipulation.
2018-06-21 22:33:02 +02:00
Evan Kranzler
36c0e35035
Implemented Leonin Vanguard
2018-06-21 15:34:05 -04:00
Noah Gleason
9b68e0860b
Implement Neurok Transmuter
2018-06-21 15:29:17 -04:00
Evan Kranzler
2b2f3b6e01
Updated "this spell" wordings
2018-06-21 12:32:25 -04:00
LevelX2
cd8e038679
* Changes for netMana null handling #5023 .
2018-06-21 16:27:05 +02:00
Evan Kranzler
db07686008
Implemented Departed Deckhand
2018-06-21 08:37:18 -04:00
Noah Gleason
6a2eda0146
Implement Mourner's Shield
2018-06-20 23:11:07 -04:00
Evan Kranzler
9c7fc43737
Implemented One with the Machine
2018-06-20 16:26:55 -04:00
Evan Kranzler
d9dfef24ce
updated "can't be countered" text
2018-06-20 11:21:06 -04:00
Evan Kranzler
b90426c6b7
Implemented Amulet of Safekeeping
2018-06-19 22:45:04 -04:00
Evan Kranzler
b7169d7097
Implemented Chromium, the Mutable
2018-06-19 17:10:20 -04:00
Evan Kranzler
8c01cd72f9
Lightning Mare
2018-06-19 16:48:44 -04:00