Commit Graph

4900 Commits

Author SHA1 Message Date
Michael Kamensky
f72526fa08 Merge branch 'fix-capricopian' into 'master'
Fix Capricopian

Closes #1411

See merge request core-developers/forge!2819
2020-05-18 03:13:35 +00:00
friarsol
e96fa0cc96 Fix Capricopian 2020-05-17 21:40:09 -04:00
Hans Mackowiak
b12f97daa2 TriggerChangesZone: Trigger on leaving the battlefield look back in time using LKI 2020-05-15 14:15:34 +02:00
rory
815a0f5da9 checking for unique mana symbols correctly considers generic mana costs on split cards 2020-05-14 11:51:40 -07:00
Hans Mackowiak
7b151bf78a Fix Discard cost with Library of Leng 2020-05-14 08:26:18 +00:00
Michael Kamensky
fffb01a81c Merge branch 'companion-ai' into 'master'
Add "AI" for Companion choosing

Closes #1406

See merge request core-developers/forge!2809
2020-05-13 05:16:08 +00:00
friarsol
022875f07a Add "AI" for Companion choosing 2020-05-12 21:26:41 -04:00
Hans Mackowiak
d25825c595 CostPayment: reset CardMatrix after being used 2020-05-12 10:19:29 +00:00
Hans Mackowiak
3f428ee7d4 Effects and Emblems are not token, cards on the field without card types are sill permanents 2020-05-12 06:57:53 +00:00
rory
77c15b1673 move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop 2020-05-11 16:46:48 -07:00
swordshine
369a366b4f Merge branch 'master' into 'master'
translate some text

See merge request core-developers/forge!2502
2020-05-11 10:57:49 +00:00
rory
51e945df72 Merge branch 'master' into jegantha 2020-05-10 11:39:14 -07:00
rory
4eb21594b4 Jegantha, the Wellspring 2020-05-10 11:34:07 -07:00
Hans Mackowiak
bb84b4a4d4 SpellAbility: copy PaidHash when copy spell ability 2020-05-10 16:53:34 +02:00
CCTV-1
b66eb6266d translate Companion choose dialog,update translations,update chinese characters. 2020-05-10 16:40:24 +08:00
CCTV-1
e0b61e7453 Merge remote-tracking branch 'upstream/master' 2020-05-10 16:36:25 +08:00
Sol
538430009b Merge branch 'patch' into 'master'
Update Companion cards

See merge request core-developers/forge!2793
2020-05-09 01:06:50 +00:00
swordshine
447453977d Update scripts 2020-05-08 22:52:10 +08:00
swordshine
085c9f0042 Add Umori, the Collector 2020-05-08 21:58:28 +08:00
swordshine
97bcf8f9c7 Update more Companion cards based on Northmoc's scripts 2020-05-08 19:49:37 +08:00
swordshine
2fd4f9c31f Update Companion restriction for Lurrus and Zirda 2020-05-08 15:08:18 +08:00
Hans Mackowiak
d1199e2698 DamageDealEffect: fix removeDamage 2020-05-08 05:53:19 +00:00
Michael Kamensky
a1d241dd6e Merge branch 'companion' into 'master'
Companion

See merge request core-developers/forge!2714
2020-05-08 03:43:23 +00:00
Hans Mackowiak
35dd052c93 LethalDamage: update Property when PT or counter changes 2020-05-08 03:38:44 +00:00
Hans Mackowiak
cc10e91431 CastSA: fix LastZone use LKI copy when put on stack 2020-05-08 03:38:11 +00:00
friarsol
8ab0857750 Add Companion keyword 2020-05-07 22:54:15 -04:00
Blacksmith
98d80a1328 [maven-release-plugin] prepare for next development iteration 2020-05-05 16:05:39 +00:00
Blacksmith
2d3a538f6d [maven-release-plugin] prepare release forge-1.6.34 2020-05-05 16:05:31 +00:00
Hans Mackowiak
4047dfe727 InputPayMana: fix ManaInput Dialog using getAbilityToPlay 2020-05-05 01:57:31 +00:00
Hans Mackowiak
18154ca0b7 DealDamage: add ExcessDamage 2020-05-04 14:04:02 +00:00
Hans Mackowiak
3b6160cd88 cards: some fixes with delayed trigger and putcounter 2020-05-03 12:06:08 +02:00
Hans Mackowiak
b964cc6448 add ChooseEvenOdd 2020-05-03 04:55:13 +00:00
Hans Mackowiak
eb0a30f013 TriggerDiscardAll: new trigger for Rielle, the Everwise 2020-04-30 09:50:55 +00:00
Anthony Calosa
c5aa8cfae7 Fix Card Display on Network Client
Adventure, Flip, Transform, Manifest, Morph etc display properly on Client Side (fix #159)
Also Fix Aura Display

I don't encounter issue #512 anyomre but I leave it open (limited testing)
2020-04-30 06:20:05 +08:00
Hans Mackowiak
39378e9776 Trigger: fix NPE if ValidSource or ValidTarget is missing for damage trigger 2020-04-29 08:53:31 +02:00
Hans Mackowiak
c7f0def063 GameAction: hotfix for CastSA 2020-04-28 17:09:35 +00:00
CCTV-1
5a3db18220 Merge remote-tracking branch 'upstream/master' 2020-04-28 16:21:04 +08:00
Hans Mackowiak
2df5373902 DamageMap: TriggerDamageDealtOnce and TriggerDamageDoneOnce now filter the amount 2020-04-28 08:09:59 +02:00
Hans Mackowiak
1ea93a6f2e Last state land fix 2020-04-28 05:24:49 +00:00
Tim Mocny
11c5b00130 Raid wording change 2020-04-28 00:37:54 +00:00
Michael Kamensky
bd54bbe026 Merge branch 'patch' into 'master'
Add The Ozolith

See merge request core-developers/forge!2764
2020-04-27 15:54:35 +00:00
Hans Mackowiak
c2248ef905 Game: remove SpellAbilityCache 2020-04-27 10:32:17 +00:00
swordshine
74c92590fc Add The Ozolith 2020-04-27 16:16:11 +08:00
Hans Mackowiak
8d1c02012e Resolve "'Selective Adaptation' triggers excessive memory usage" 2020-04-26 15:54:15 +00:00
Michael Kamensky
c4963821e5 Merge branch 'raptorBlockedFix' into 'master'
fix Labyrinth Raptor

Closes #1375

See merge request core-developers/forge!2761
2020-04-26 15:15:53 +00:00
Hans Mackowiak
a2b5bb911c fix Labyrinth Raptor 2020-04-26 16:57:54 +02:00
Anthony Calosa
d754c2c4d3 Update Win/Lose Overlay (mobile)
At the end of the match, user can minimize the overlay to see the last battlefield and browse other zones, to bring up the overlay, click game menu, and click Show WinLose Overlay.

Also fixes issue #928
2020-04-26 15:00:57 +08:00
Hans Mackowiak
b5deb0b252 fix Cycling for Zero with xPaid, also do Zaxara with xPaid 2020-04-25 19:56:37 +00:00
Hans Mackowiak
a9b5e1d112 Resolve "Used memory grows quadratic in the number of triggered spells" 2020-04-25 17:36:50 +00:00
Tim Mocny
f02ab6c073 Zaxara (C20) 2020-04-24 14:33:18 +00:00