external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,877 Commits 31 Branches 187 Tags
a75b4824e0e994e8fccb2a19ef05de6e9853e7cc
Commit Graph

46877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
46d4bfd7c8 Remove Unused Import 2021-01-09 16:22:46 +08:00
Michael Kamensky
9567777826 Merge branch 'patch-12' into 'master' 
Update The List.txt Kaldheim

See merge request core-developers/forge!3569
 2021-01-09 07:02:03 +00:00
Michael Kamensky
b243b9ce38 Merge branch 'master' into 'master' 
Revert a debug commit to mobile-dev

See merge request core-developers/forge!3573
 2021-01-09 06:34:44 +00:00
Michael Kamensky
d6f48ebb30 - Revert a debug commit to mobile-dev 2021-01-09 09:34:16 +03:00
Michael Kamensky
a6f10974c9 Merge branch 'master' into 'master' 
Fix the SpellApiToAi assignment for ImmediateTrigger

See merge request core-developers/forge!3572
 2021-01-09 06:33:26 +00:00
Michael Kamensky
c72f099e7b - Fix the SpellApiToAi assignment for ImmediateTrigger 2021-01-09 09:32:11 +03:00
Michael Kamensky
04e38e0609 Merge branch 'heartPiercer' into 'master' 
WrappedAbility: fix TriggeredRemembered being sacrificed

See merge request core-developers/forge!3525
 2021-01-09 06:15:05 +00:00
Hans Mackowiak
584b6bd81e WrappedAbility: fix TriggeredRemembered being sacrificed 2021-01-09 06:15:05 +00:00
Michael Kamensky
35ca083650 Merge branch 'patch-8' into 'master' 
Update worlds.txt

See merge request core-developers/forge!3570
 2021-01-09 05:09:51 +00:00
Sol
a6257c6faf Merge branch 'fullborderfixes' into 'master' 
Fullborderfixes

See merge request core-developers/forge!3533
 2021-01-09 02:38:27 +00:00
Sol
9b35f86818 Merge branch 'newMatchfix' into 'master' 
Fix match restarting after first time

See merge request core-developers/forge!3538
 2021-01-09 02:29:07 +00:00
Sol
bf19fcfc83 Merge branch 'fixStackDesc' into 'master' 
Fix remaining placeholders in stackDescription

Closes #1349

See merge request core-developers/forge!3537
 2021-01-09 02:27:52 +00:00
Gabriel Franco
52d7c4b786 Update worlds.txt 2021-01-08 10:02:58 +00:00
John
a7cbe6995a Update The List.txt 2021-01-08 09:45:01 +00:00
Michael Kamensky
cdd4a0c904 Merge branch 'edition-updates' into 'master' 
Update Throne of Eldraine edition sections

See merge request core-developers/forge!3567
 2021-01-07 14:08:57 +00:00
Michael Kamensky
ae7a040bdc Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3566
 2021-01-07 14:08:49 +00:00
friarsol
944b9a3b29 Update Throne of Eldraine edition sections 2021-01-06 21:41:33 -05:00
Andreas Bendel
b24ed6b31a Update de-DE.properties 
corrected translation lblWouldYouLikeFight
 2021-01-06 19:52:13 +00:00
Hans Mackowiak
a5ca6cd0df Merge branch 'master' into 'master' 
Kraul Harpooner fix

Closes #737

See merge request core-developers/forge!3562
 2021-01-06 15:07:33 +00:00
Hythonia
c75fa0f057 Kraul Harpooner fix 2021-01-06 15:07:33 +00:00
Sol
d3ce61a0a4 Merge branch '1689-x-references-on-permanents-do-not-work' into 'master' 
Resolve "X references on permanents do not work."

Closes #1690 and #1689

See merge request core-developers/forge!3563
 2021-01-06 13:28:25 +00:00
Hans Mackowiak
8a2db82e1f HumanPlaySpellAbility: fixes setXManaCostPaid when cost doesn't has X 2021-01-06 14:20:45 +01:00
Michael Kamensky
4ca0765df5 Merge branch 'master' into 'master' 
Basic AI logic for Sigrid, God Favored.

See merge request core-developers/forge!3561
 2021-01-06 10:24:58 +00:00
Michael Kamensky
5e6d9cef13 - Remove an unnecessary variable. 2021-01-06 09:14:02 +03:00
Michael Kamensky
260b19d807 - Add targeting validity checks. 2021-01-06 09:13:29 +03:00
Michael Kamensky
a9346a16be - Basic logic for Sigrid, God Favored. 2021-01-06 08:56:19 +03:00
Michael Kamensky
90e3c39b73 Merge branch 'khm4' into 'master' 
KHM - 4 Jan

See merge request core-developers/forge!3556
 2021-01-06 05:26:33 +00:00
Michael Kamensky
bc867d5d37 Merge branch 'setStateLKI' into 'master' 
SetStateEffect: use getCardState to support LKI

See merge request core-developers/forge!3558
 2021-01-06 04:39:08 +00:00
Hans Mackowiak
b7db7bccfd SetStateEffect: use getCardState to support LKI 2021-01-05 11:44:55 +01:00
Michael Kamensky
b154f22188 Merge branch 'forcastBoast' into 'master' 
Forecast boast

See merge request core-developers/forge!3553
 2021-01-05 05:54:12 +00:00
Hans Mackowiak
9e91a0ac09 Forecast boast 2021-01-05 05:54:12 +00:00
Michael Kamensky
ecdf29c1fa Merge branch 'tawnosfix' into 'master' 
tawnoss_coffin.txt +Duration$ Permanent

See merge request core-developers/forge!3557
 2021-01-05 05:53:35 +00:00
Northmoc
e85b489ed9 sigrid_god_favored.txt (medusa) 2021-01-04 15:39:42 -05:00
Northmoc
66e542ded7 r_2_3_demon_berserker_menace.txt 2021-01-04 12:42:25 -05:00
Northmoc
a635aa7974 the_bloodsky_massacre.txt (medusa) 2021-01-04 12:39:36 -05:00
Northmoc
2f572eb2e1 toski_bearer_of_secrets.txt (The Cheese Stands Alone) 2021-01-04 12:35:26 -05:00
Northmoc
71124a397e righteous_valkyrie.txt (Marvel) 2021-01-04 12:16:21 -05:00
Northmoc
79bb3d2638 tawnoss_coffin.txt +Duration$ Permanent 2021-01-04 12:03:48 -05:00
Anthony Calosa
0e537965db Merge branch 'master' into 'master' 
Upscaled logo & splashscreen for mobile forge

See merge request core-developers/forge!3555
 2021-01-04 01:45:37 +00:00
Anthony Calosa
7ed634541d [Mobile] Add upscaled logo & splashscreen 2021-01-04 09:41:22 +08:00
Anthony Calosa
aa15eaf007 Remove Unused Import 2021-01-04 09:38:35 +08:00
Anthony Calosa
1920bc0518 Merge branch 'master' into 'master' 
Fix It That Betrays

Closes #1687

See merge request core-developers/forge!3554
 2021-01-03 23:26:37 +00:00
Anthony Calosa
408ae43037 Merge remote-tracking branch 'core/master' 2021-01-04 07:25:17 +08:00
Anthony Calosa
606fc3088b Fix It That Betrays 
closes #1687
 2021-01-04 07:24:36 +08:00
Hans Mackowiak
357243f540 Merge branch 'ChooseCardAmount' into 'master' 
Extend ChooseCardEffect amount

See merge request core-developers/forge!3551
 2021-01-03 18:05:28 +00:00
Hans Mackowiak
e7f7bac7cb Merge branch 'master' into 'master' 
Add Vow of Torment

See merge request core-developers/forge!3552
 2021-01-03 18:03:56 +00:00
Hythonia
e727f89eda Vow of Torment 2021-01-03 16:29:49 +00:00
Michael Kamensky
fb8d096d8d Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3550
 2021-01-03 10:24:28 +00:00
tool4EvEr
1e747a96bd Support for default placeholders 2021-01-03 00:50:01 +01:00
Andreas Bendel
b7e5ee168c Update de-DE.properties 
translated lblAssignCombatDamageAsChoose
 2021-01-02 21:27:43 +00:00