external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,606 Commits 32 Branches 187 Tags
57b4135f95d24f3d0875a8cd293d6baf8f8d653b
Commit Graph

44606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
eb0a30f013 TriggerDiscardAll: new trigger for Rielle, the Everwise 2020-04-30 09:50:55 +00:00
Michael Kamensky
be1574b44d Merge branch 'newBranch' into 'master' 
Fix Card Display on Network Client

Closes #159

See merge request core-developers/forge!2775
 2020-04-30 04:19:56 +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
Michael Kamensky
2e3e3537fb Merge branch '1387-npe-in-triggerdamagedealtonce-getdamagetargets-triggerdamagedealtonce-java-126' into 'master' 
Resolve "NPE in TriggerDamageDealtOnce.getDamageTargets(TriggerDamageDealtOnce.java:126)"

Closes #1387

See merge request core-developers/forge!2774
 2020-04-29 08:02:31 +00:00
Hans Mackowiak
39378e9776 Trigger: fix NPE if ValidSource or ValidTarget is missing for damage trigger 2020-04-29 08:53:31 +02:00
swordshine
6a73a990db Merge branch 'gzlands' into 'master' 
SLD - Godzilla lands

See merge request core-developers/forge!2773
 2020-04-29 01:03:12 +00:00
Tim Mocny
be73f20ce0 SLD - Godzilla lands 2020-04-29 01:03:12 +00:00
Michael Kamensky
44e411f925 Merge branch 'fixCastSA' into 'master' 
GameAction: hotfix for CastSA

See merge request core-developers/forge!2772
 2020-04-28 17:09:35 +00:00
Hans Mackowiak
c7f0def063 GameAction: hotfix for CastSA 2020-04-28 17:09:35 +00:00
CCTV-1
986a273772 update translation 2020-04-28 16:23:28 +08:00
CCTV-1
6a7bfd48bf translate new menu item 2020-04-28 16:23:12 +08:00
Michael Kamensky
4e6addcf84 Merge branch 'damageMultipleAmount' into 'master' 
DamageMap: TriggerDamageDealtOnce and TriggerDamageDoneOnce now filter the amount

Closes #1382

See merge request core-developers/forge!2771
 2020-04-28 08:22:20 +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
Michael Kamensky
3a53ab8a9c Merge branch 'lastStateLandFix' into 'master' 
Last state land fix

Closes #1386

See merge request core-developers/forge!2770
 2020-04-28 05:24:50 +00:00
Hans Mackowiak
1ea93a6f2e Last state land fix 2020-04-28 05:24:49 +00:00
swordshine
970c3451e9 Merge branch 'bans' into 'master' 
April 2020 Bans

See merge request core-developers/forge!2769
 2020-04-28 00:38:08 +00:00
Tim Mocny
0960ed98f0 April 2020 Bans 2020-04-28 00:38:08 +00:00
swordshine
4701371b17 Merge branch 'raid' into 'master' 
Raid wording change

Closes #1357

See merge request core-developers/forge!2768
 2020-04-28 00:37:54 +00:00
Tim Mocny
11c5b00130 Raid wording change 2020-04-28 00:37:54 +00:00
Michael Kamensky
e0f2d09dfd Merge branch 'master' into 'master' 
Fix an issue with imprinting not working correctly in game states after the first game.

Closes #1383

See merge request core-developers/forge!2766
 2020-04-27 17:23:59 +00:00
Agetian
2d355d4ea3 - Fix an issue with imprinting not working correctly in game states after the first game. 2020-04-27 20:18:35 +03:00
Michael Kamensky
bea46a7a8c Merge branch 'fixes' into 'master' 
Fixes - 27 April

See merge request core-developers/forge!2765
 2020-04-27 17:13:07 +00:00
Tim Mocny
d13439500f Fixes - 27 April 2020-04-27 17:13:07 +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
Michael Kamensky
15f147ac9c Merge branch 'removeSpellAbilityCache' into 'master' 
Game: remove SpellAbilityCache

See merge request core-developers/forge!2763
 2020-04-27 10:32:17 +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
Michael Kamensky
552a7130a5 Merge branch '1380-selective-adaptation-triggers-excessive-memory-usage' into 'master' 
Resolve "'Selective Adaptation' triggers excessive memory usage"

Closes #1380

See merge request core-developers/forge!2762
 2020-04-26 15:54:16 +00: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
Michael Kamensky
8a648c9ccf Merge branch 'newBranch' into 'master' 
Update Win/Lose Overlay (mobile)

Closes #1367 and #928

See merge request core-developers/forge!2760
 2020-04-26 15:15:48 +00:00
Hans Mackowiak
a2b5bb911c fix Labyrinth Raptor 2020-04-26 16:57:54 +02:00
Anthony Calosa
e7cbee211d Update controls 2020-04-26 18:37:10 +08:00
Anthony Calosa
a553103e39 AI vs AI match shows Match Results (mobile) 2020-04-26 17:25:44 +08:00
Anthony Calosa
45a5e76e63 refactor CardAreaPanel.resetForNewGame 
fix issue ##1367
 2020-04-26 16:44:32 +08:00
Anthony Calosa
8122589842 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-26 15:26:14 +08: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
swordshine
7e9843aae5 Merge branch 'heliodsp' into 'master' 
Heliod's Punishment stack cleanup (ORIGINALHOST stack issue)

See merge request core-developers/forge!2647
 2020-04-26 03:46:06 +00:00
Tim Mocny
2897d4304d Heliod's Punishment stack cleanup (ORIGINALHOST stack issue) 2020-04-26 03:46:06 +00:00
swordshine
f5400d18bd Merge branch 'extinctionfix' into 'master' 
extinction_event.txt - fix

Closes #1377

See merge request core-developers/forge!2759
 2020-04-26 00:48:39 +00:00
Tim Mocny
46983de66f extinction_event.txt - fix 2020-04-26 00:48:39 +00:00
Michael Kamensky
049e129606 Merge branch 'fixXPaidZeroCyclingCastTrigger' into 'master' 
fix Cycling for Zero with xPaid, also do Zaxara with xPaid

See merge request core-developers/forge!2758
 2020-04-25 19:56:37 +00:00
Hans Mackowiak
b5deb0b252 fix Cycling for Zero with xPaid, also do Zaxara with xPaid 2020-04-25 19:56:37 +00:00
Michael Kamensky
0bb42a2794 Merge branch '1372-used-memory-grows-quadratic-in-the-number-of-triggered-spells' into 'master' 
Resolve "Used memory grows quadratic in the number of triggered spells"

Closes #1372

See merge request core-developers/forge!2756
 2020-04-25 17:36:50 +00:00
Hans Mackowiak
a9b5e1d112 Resolve "Used memory grows quadratic in the number of triggered spells" 2020-04-25 17:36:50 +00:00
Michael Kamensky
c1c9271458 Merge branch 'master' into 'master' 
Add color requirement AI hints to the ELD land cycle that usually comes tapped.

See merge request core-developers/forge!2757
 2020-04-25 15:52:43 +00:00
Agetian
44e4dfecca - Add color requirement AI hints to the ELD land cycle that usually comes tapped and has a "comes untapped" effect. 2020-04-25 18:38:36 +03:00
swordshine
d809fa6b91 Merge branch 'mysticsubdual' into 'master' 
IKO - mystic_subdual.txt

See merge request core-developers/forge!2754
 2020-04-25 04:47:10 +00:00
Tim Mocny
c5a89747b8 IKO - mystic_subdual.txt 2020-04-25 04:47:10 +00:00