Commit Graph

46877 Commits

Author SHA1 Message Date
Northmoc
0e8c879445 [Pump w/ Defined] better than [PumpAll w/ Valid] 2020-11-29 16:10:18 -05:00
Northmoc
c8bbc8b95e finalize change to Player.java 2020-11-29 16:08:29 -05:00
Northmoc
615f2a47aa curse_of_vengeance.txt 2020-11-29 16:08:29 -05:00
Northmoc
2dd8fc27b5 support "that player's life total as the turn began" 2020-11-29 16:08:28 -05:00
Northmoc
af9e11059f sengir_the_dark_baron.txt 2020-11-29 16:08:28 -05:00
Hans Mackowiak
cf25c1aaa8 AnimateEffectBase: add OverridingAbility to created Trigger 2020-11-29 15:50:41 +01:00
Michael Kamensky
be37314500 Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt (bag of rocks fix) working

See merge request core-developers/forge!3460
2020-11-29 12:51:07 +00:00
Michael Kamensky
cbc293edff Merge branch 'master' into 'master'
Oracle text patch for Lifelink

See merge request core-developers/forge!3454
2020-11-29 12:50:45 +00:00
Hans Mackowiak
81bfaf2a15 Match: add extra Event Loop to Match for Events when the Game is closed 2020-11-29 11:19:00 +01:00
Hans Mackowiak
88c017f962 GameView: do not store Game anymore, get it from Match 2020-11-29 11:18:58 +01:00
Hythonia
2163aadeb1 Update lifelink.txt 2020-11-29 09:44:26 +00:00
John
65ce17eb19 Update Secret Lair Drop Series.txt 2020-11-29 09:03:03 +00:00
Hans Mackowiak
70e75bde91 PlayerControllerAI: fix trigger shouldn't be added to stack if target is invalid 2020-11-29 09:47:03 +01:00
Michael Kamensky
f6d2053a47 Merge branch 'huatli_fix' into 'master'
huatli_warrior_poet.txt fix

See merge request core-developers/forge!3459
2020-11-29 04:05:20 +00:00
Northmoc
ae1e25c8d8 huatli_warrior_poet.txt fix 2020-11-28 19:15:51 -05:00
Tim Mocny
517f27a012 Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt bag of rocks fix

See merge request core-developers/forge!3456
2020-11-28 21:14:59 +00:00
Hans Mackowiak
1def6b4b9d Merge branch '1652-java-lang-runtimeexception-abilityfactory-getability-parallax-dementia-has-no-svar-trigdestroy' into 'master'
Resolve "java.lang.RuntimeException: AbilityFactory : getAbility -- Parallax Dementia has no SVar: TrigDestroy"

Closes #1652

See merge request core-developers/forge!3458
2020-11-28 19:35:00 +00:00
Hans Mackowiak
5ee627bf87 Update parallax_dementia 2020-11-28 19:34:41 +00:00
John
0e599d804f Update Secret Lair Drop Series.txt 2020-11-28 17:45:46 +00:00
Michael Kamensky
af0900a48c Merge branch 'spentColorsSpellAbility' into 'master'
SpellAbility: moved ManaSpent from Card into CastSA

See merge request core-developers/forge!3455
2020-11-28 17:13:38 +00:00
Hans Mackowiak
ab0331cd6e SpellAbility: moved ManaSpent from Card into CastSA 2020-11-28 11:44:24 +01:00
Hythonia
bc87a57036 add Oracle to Lifelink 2020-11-28 09:38:07 +00:00
Hans Mackowiak
a7c474cea4 AbilityUtils: fix NPE then using TriggeredCount with TokenScript 2020-11-28 10:05:30 +01:00
Michael Kamensky
c9f9781576 Merge branch 'doubleagenda' into 'master'
Double agenda - Summoner's Bond!

Closes #113

See merge request core-developers/forge!3449
2020-11-28 04:23:01 +00:00
Michael Kamensky
dca773420e Merge branch 'call_bandaid' into 'master'
update call_the_coppercoats.txt

See merge request core-developers/forge!3450
2020-11-28 04:22:34 +00:00
Michael Kamensky
fede5cb41c Merge branch 'fix-headless' into 'master'
Finally block blowing up when no exception is thrown.

See merge request core-developers/forge!3453
2020-11-28 04:22:23 +00:00
swordshine
c8457d8ded Merge branch 'master' into 'master'
Ethereal Forager corner case fix

Closes #1364

See merge request core-developers/forge!3447
2020-11-28 04:05:47 +00:00
Hythonia
3d46bb89ae Revert "Drain Life update"
This reverts commit 539406b4a1f032e78a91550e65b4c21924082d3d
2020-11-28 04:05:47 +00:00
swordshine
4785ea30a9 Merge branch '1641' into 'master'
raving_dead.txt cleanup

Closes #1641

See merge request core-developers/forge!3451
2020-11-28 04:00:11 +00:00
swordshine
8948af786a Merge branch '1627' into 'master'
norin_the_wary.txt cleanup

Closes #1627

See merge request core-developers/forge!3452
2020-11-28 03:59:46 +00:00
friarsol
a8b7d67d9a Finally block blowing up when no exception is thrown. 2020-11-27 21:56:12 -05:00
Northmoc
6139c92829 norin_the_wary.txt cleanup 2020-11-27 19:01:06 -05:00
Northmoc
53df57a14d raving_dead.txt cleanup 2020-11-27 18:40:29 -05:00
Northmoc
efd566579b update call_the_coppercoats.txt 2020-11-27 16:27:11 -05:00
Northmoc
8abb8e784d Double agenda - Summoner's Bond! 2020-11-27 15:53:12 -05:00
Anthony Calosa
e77621130a Merge branch 'master' into 'master'
refactor Java streams to loop (fix android build)

See merge request core-developers/forge!3448
2020-11-27 14:05:17 +00:00
Anthony Calosa
c27f5abfa5 refactor Java streams to loop (fix android build) 2020-11-27 22:03:59 +08:00
Michael Kamensky
dd6f208193 Merge branch 'ardenn' into 'master'
CMR: Ardenn - move Cleanup to right spot

See merge request core-developers/forge!3445
2020-11-27 07:12:05 +00:00
Michael Kamensky
3fc20efa9e Merge branch 'allow-generic-edition-sections' into 'master'
Custom print sheets in edition files

See merge request core-developers/forge!3442
2020-11-27 07:11:57 +00:00
Anthony Calosa
1b86c83820 Merge branch 'master' into 'master'
fix IPaperCard border color, prevent NPE

See merge request core-developers/forge!3446
2020-11-27 04:51:25 +00:00
Anthony Calosa
f815a9c0d0 tint IPaperCard border 2020-11-27 12:45:58 +08:00
Anthony Calosa
6810e7bc04 Prevent NPE 2020-11-27 12:44:33 +08:00
Northmoc
14379f392c move Cleanup to right spot 2020-11-26 23:26:10 -05:00
Hans Mackowiak
3fd8953a6c GameAction: don't copy states anymore when card is copied for changed zones 2020-11-26 19:16:43 +01:00
Michael Kamensky
835272e82f Merge branch 'holiday' into 'master'
Happy Holidays!

See merge request core-developers/forge!3439
2020-11-26 18:02:28 +00:00
Michael Kamensky
f1b495cbf7 Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt Secretversary

See merge request core-developers/forge!3437
2020-11-26 18:02:09 +00:00
Michael Kamensky
0764c636dd Merge branch 'master' into 'master'
Drain Life and Soul Burn update

Closes #571 and #576

See merge request core-developers/forge!3436
2020-11-26 18:01:48 +00:00
Hythonia
f6242e3abf Revert "Drain Life update"
This reverts commit 539406b4a1f032e78a91550e65b4c21924082d3d
2020-11-26 18:01:48 +00:00
Michael Kamensky
b43f5544a2 Merge branch 'fix' into 'master'
Various fixes

See merge request core-developers/forge!3434
2020-11-26 18:01:27 +00:00
Hans Mackowiak
59270db775 Merge branch 'exploreFix' into 'master'
ExploreEffect: add ChangesZoneAll trigger

Closes #1648

See merge request core-developers/forge!3441
2020-11-26 13:25:30 +00:00