Commit Graph

5679 Commits

Author SHA1 Message Date
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
Tim Mocny
67c0722db8 Titans' Nest (IKO) 2020-04-23 15:00:05 +00:00
Tim Mocny
b12ed3307a Capricopian (C20) 2020-04-22 17:12:23 +00:00
Tim Mocny
e621972ad2 Xyris (C20) 2020-04-22 15:13:30 +00:00
Anthony Calosa
96e243e4c9 Refactor stack -> Deque, add check for transformCount 2020-04-22 07:29:49 +08:00
Anthony Calosa
828885c9b0 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-22 05:55:38 +08:00
Tim Mocny
4ffbaf87a0 Nikara and Yannik (C20) 2020-04-21 18:28:37 +00:00
Tim Mocny
30cdf13d88 Netherborn Altar (C20) and Command Beacon update 2020-04-21 16:52:30 +00:00
Anthony Calosa
8acb143fea Improve Online Lobby (Mobile port) 2020-04-21 17:52:05 +08:00
Tim Mocny
d6efcee188 Fireflux Squad (C20) 2020-04-20 04:15:19 +00:00
Michael Kamensky
4744f11e69 Merge branch 'newBranch' into 'master'
Update KeywordCard, add Flash Icon, try to prevent rotate bug

See merge request core-developers/forge!2715
2020-04-19 16:28:04 +00:00
Tim Mocny
8c023fbfea Martial Impetus and Frontier Warmonger (C20) 2020-04-19 16:07:29 +00:00
Hans Mackowiak
ef95f02fa2 Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw 2020-04-19 03:24:10 +00:00
Anthony Calosa
1f7dade4f9 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-18 05:56:27 +08:00
Tim Mocny
bf548096f1 ★Winota 2020-04-17 13:08:57 +00:00
Anthony Calosa
ebd0e12bee Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-15 17:48:41 +08:00
Anthony Calosa
bd6a1f3a2b Update 2020-04-15 16:46:24 +08:00
Hans Mackowiak
759703bf56 WrappedAbility: fix trigger not set for confirmTrigger 2020-04-15 08:13:16 +00:00
CCTV-1
e85ed216be Merge remote-tracking branch 'upstream/master' 2020-04-15 13:58:10 +08:00
Anthony Calosa
5467701fa0 Update Keyword Effects
Whenever a keyword is added/removed to the player, it will update the keyword card, and will auto remove it if its empty
2020-04-15 12:29:55 +08:00
Anthony Calosa
d87d825bce Network Improvements 2020-04-15 02:40:18 +00:00
Anthony Calosa
d4625864df Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-15 07:39:35 +08:00