Commit Graph

43884 Commits

Author SHA1 Message Date
Michael Kamensky
71dfe3146b Merge branch 'patch' into 'master'
Add Eidolon of Obstruction

See merge request core-developers/forge!2402
2020-01-10 07:31:00 +00:00
Agetian
9ed01ebbb6 - Override getParamOrDefault for the sake of WrappedAbility, fixes Verdurous Gearhulk AI allocation. 2020-01-10 10:27:30 +03:00
swordshine
0e7af09df3 Add Eidolon of Obstruction 2020-01-10 15:13:26 +08:00
swordshine
3c4844e46d Merge branch 'thb' into 'master'
Fix Dig in Thassas Oracle

See merge request core-developers/forge!2401
2020-01-10 01:11:48 +00:00
swordshine
965b67577a Merge branch 'thb9' into 'master'
THB 1/9

See merge request core-developers/forge!2399
2020-01-10 01:11:28 +00:00
Tim Mocny
8bcb38d4fc THB 1/9 2020-01-10 01:11:28 +00:00
Adam Pantel
071873718e Fix Dig in Thassas Oracle, disallow cancel 2020-01-09 14:16:39 -05:00
Michael Kamensky
7583b67bda Merge branch '1222-exception-with-dfcs-and-copy-effects' into 'master'
Resolve "Exception with DFCs and copy effects"

Closes #1222

See merge request core-developers/forge!2400
2020-01-09 15:32:20 +00:00
Hans Mackowiak
96d3ddf9b5 Resolve "Exception with DFCs and copy effects" 2020-01-09 15:32:20 +00:00
swordshine
dc0ddf542b Merge branch 'temp' into 'master'
Clear controller when leaving battlefield/stack

Closes #619

See merge request core-developers/forge!2397
2020-01-09 14:21:36 +00:00
swordshine
724e483ae3 Merge branch 'patch' into 'master'
Fix Nykthos

See merge request core-developers/forge!2398
2020-01-09 13:06:14 +00:00
swordshine
910fef3ecd Fix Nykthos 2020-01-09 20:59:20 +08:00
Adam Pantel
65288905d0 Clear controller when leaving battlefield/stack 2020-01-08 20:12:13 -05:00
swordshine
82d7171a92 Merge branch 'patch-5' into 'master'
THB 1/8

See merge request core-developers/forge!2395
2020-01-09 00:55:41 +00:00
Tim Mocny
20b51f59b0 Storm Herald - I didn't add AtEOT$ Exile to the animate anticipating some corner case Izzet shenanigans where this card gets flashed in on someone else's turns and the auras last until YOUR next end step. Possible it still can be cleaned up in some way. But this seems correct. 2020-01-09 00:55:41 +00:00
swordshine
16c06c7d7d Merge branch 'thb' into 'master'
Taranika, Thassas Oracle

See merge request core-developers/forge!2393
2020-01-09 00:55:03 +00:00
Adam Pantel
0aa20cb3f4 Taranika, Thassas Oracle 2020-01-08 10:08:59 -05:00
swordshine
71787b7059 Merge branch 'patch' into 'master'
Add Altar of the Pantheon

See merge request core-developers/forge!2392
2020-01-08 10:43:50 +00:00
Michael Kamensky
a9407467a5 Merge branch 'patch-escapeMod' into 'master'
CardFactoryUtil: add Escaped Modifier

See merge request core-developers/forge!2394
2020-01-08 10:18:56 +00:00
Hans Mackowiak
896eb79d2c CardFactoryUtil: add Escaped Modifier 2020-01-08 10:18:56 +00:00
swordshine
fb6f34d67e Merge branch 'spanishcards06' into 'master'
Spanish cards translation (N-O-P-Q-R-S)

See merge request core-developers/forge!2391
2020-01-08 07:33:08 +00:00
Blacksmith
9e9570d191 Clear out release files in preparation for next release 2020-01-08 02:25:33 +00:00
Blacksmith
1b130ab157 [maven-release-plugin] prepare for next development iteration 2020-01-08 02:20:36 +00:00
Blacksmith
74005529f5 [maven-release-plugin] prepare release forge-1.6.31 forge-1.6.31 2020-01-08 02:20:31 +00:00
Blacksmith
4186a365cb Update README.txt for release 2020-01-08 02:18:23 +00:00
swordshine
4366db1acc Add Altar of the Pantheon 2020-01-08 08:42:28 +08:00
klaxnek
4679e00a9e Spanish cards translation (N-O-P-Q-R-S) 2020-01-07 17:32:06 +01:00
Michael Kamensky
51960f0e28 Merge branch 'temp' into 'master'
DigUntil should do nothing on 0

See merge request core-developers/forge!2390
2020-01-07 16:29:43 +00:00
Adam Pantel
a27f69b1c5 DigUntil does nothing on 0 2020-01-07 10:06:33 -05:00
Michael Kamensky
8ab01cce3e Merge branch 'patch' into 'master'
Update Pharika's Spawn using ImmediateTrigger

See merge request core-developers/forge!2388
2020-01-07 11:54:20 +00:00
swordshine
e10235aae9 Remove a cleanup for Atris 2020-01-07 16:48:27 +08:00
swordshine
05591c6bd9 Atris should use targeting 2020-01-07 16:46:16 +08:00
swordshine
a25e469291 Simplify the script of Aphemia, the Cacophony 2020-01-07 14:41:50 +08:00
swordshine
ebd14944c6 Update Pharika's Spawn using ImmediateTrigger 2020-01-07 14:35:23 +08:00
swordshine
1b08fc3592 Merge branch 'patch-5' into 'master'
THB 1/6

See merge request core-developers/forge!2384
2020-01-07 06:29:45 +00:00
Tim Mocny
57457946e5 THB 1/6 2020-01-07 06:29:45 +00:00
Michael Kamensky
918a39ab60 Merge branch 'prerelease-standardization' into 'master'
Prerelease standardization

Closes #520

See merge request core-developers/forge!2379
2020-01-07 05:59:26 +00:00
Sol
2cc39c2580 Prerelease standardization 2020-01-07 05:59:26 +00:00
swordshine
3aca94dc9b Merge branch 'temp' into 'master'
Kiora, Uro

See merge request core-developers/forge!2385
2020-01-07 05:52:40 +00:00
apantel
65ad9d61d9 Kiora, Uro 2020-01-06 23:41:40 -05:00
swordshine
138e3a4661 Merge branch 'bug-fixes' into 'master'
Extracting two bugfixes from Lerio's MR

Closes #1211

See merge request core-developers/forge!2387
2020-01-07 04:12:37 +00:00
Sol
41844ee7e3 Extracting two bugfixes from Lerio's MR 2020-01-07 04:12:37 +00:00
Sol
d4f2594e26 Merge branch 'patch-4' into 'master'
ghireds_belligerence fix damage

See merge request core-developers/forge!2386
2020-01-07 02:02:54 +00:00
Hans Mackowiak
babc9de575 ghireds_belligerence fix damage 2020-01-07 02:02:54 +00:00
Michael Kamensky
11a5683025 Merge branch 'patch-3' into 'master'
Update missing translations in es-ES.properties

See merge request core-developers/forge!2383
2020-01-06 14:42:21 +00:00
Michael Kamensky
b6f8f89c7a Merge branch 'spanishcards05' into 'master'
Spanish cards translation (L and M)

See merge request core-developers/forge!2382
2020-01-06 14:42:16 +00:00
klaxnek
0885fe5898 Update es-ES.properties 2020-01-06 14:14:15 +00:00
klaxnek
8aa1f049ab Update missing translations in es-ES.properties 2020-01-06 11:44:58 +00:00
Peter
f7aa7bf580 Spanish cards translation (L and M) 2020-01-06 11:43:01 +01:00
Michael Kamensky
b74033fe17 Merge branch 'temp' into 'master'
Unneeded SubAbility on Primordial Mist

See merge request core-developers/forge!2380
2020-01-06 06:35:34 +00:00