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
47,517 Commits 32 Branches 187 Tags
ef13a84d43d1f4e326e70f7ca7be80483be65b0c
Commit Graph

47517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
8288913864 Merge branch 'fixAI' into 'master' 
Fix AI casting DealDamage cards with X=0

See merge request core-developers/forge!3752
 2021-02-05 04:46:02 +00:00
Michael Kamensky
33a6a46e1a Merge branch 'rimestaff' into 'master' 
Jorn God of Winter and Kaldrin the Rimestaff

See merge request core-developers/forge!3744
 2021-02-05 04:45:50 +00:00
Hans Mackowiak
592f708c00 Jorn God of Winter and Kaldrin the Rimestaff 2021-02-05 04:45:50 +00:00
Michael Kamensky
e2c824216c Merge branch 'blessingOfFrost' into 'master' 
add Blessing of Frost

See merge request core-developers/forge!3741
 2021-02-05 04:45:32 +00:00
Hans Mackowiak
ff62e8d3c0 add Blessing of Frost 2021-02-05 04:45:32 +00:00
Michael Kamensky
8f12109a50 Merge branch 'moritte' into 'master' 
add Moritte of the Frost

See merge request core-developers/forge!3742
 2021-02-05 04:45:19 +00:00
Hans Mackowiak
a567e17217 add Moritte of the Frost 2021-02-05 04:45:18 +00:00
Michael Kamensky
ec6075782e Merge branch 'twosat-master-patch-58043' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3749
 2021-02-05 04:44:49 +00:00
Michael Kamensky
b0afb50266 Merge branch 'twosat-master-patch-34521' into 'master' 
Update CONTRIBUTORS.txt

See merge request core-developers/forge!3750
 2021-02-05 04:44:37 +00:00
tool4EvEr
eb5764f69e Fix AI casting X=0 2021-02-04 22:47:35 +01:00
Anthony Calosa
006fcda2c8 Merge branch 'master' into 'master' 
[Desktop] align UI

Closes #1709

See merge request core-developers/forge!3751
 2021-02-04 20:51:09 +00:00
Anthony Calosa
fe682d87ef [Desktop] align UI 
- zoomed card
- winlose overlay
 2021-02-05 04:49:25 +08:00
Andreas Bendel
1be186cc0f Update CONTRIBUTORS.txt 
added myself (for doing DE translation)
if you think this is wrong then delete me
 2021-02-04 19:39:29 +00:00
Andreas Bendel
4bd2e6ed4f Update de-DE.properties 
translated new sound control lines
 2021-02-04 19:29:44 +00:00
Michael Kamensky
d719a4322b Merge branch 'undefined' into 'master' 
KHM In Search of Greatness

See merge request core-developers/forge!3738
 2021-02-04 19:12:30 +00:00
Michael Kamensky
435fd79321 Merge branch 'Williams-master-patch-64374' into 'master' 
KHM Fixes 4 Feb

See merge request core-developers/forge!3745
 2021-02-04 19:10:15 +00:00
Anthony Calosa
1ee5608856 Merge branch 'master' into 'master' 
[Mobile] set volume when track changes

See merge request core-developers/forge!3748
 2021-02-04 18:28:23 +00:00
Anthony Calosa
d5e1392ae7 [Mobile] set volume when track changes 2021-02-05 02:26:33 +08:00
Anthony Calosa
646173daa1 Merge branch 'master' into 'master' 
remove unnecessary conversion

See merge request core-developers/forge!3747
 2021-02-04 18:04:50 +00:00
Anthony Calosa
04fd9709ac remove unnecesary conversion 2021-02-05 02:03:03 +08:00
Anthony Calosa
26265a8741 Merge branch 'master' into 'master' 
[Mobile] Sound/Music Adjustment

See merge request core-developers/forge!3746
 2021-02-04 17:37:48 +00:00
John
32eac91c27 Update the_bears_of_littjara.txt 2021-02-04 17:37:30 +00:00
Hans Mackowiak
15016ccf80 Extend DamagedBy and add Aegar the freezing Flame 2021-02-04 18:37:05 +01:00
John
bd9143495d Update valor_of_the_worthy.txt 2021-02-04 17:34:22 +00:00
John
f9788e1a98 Update draugrs_helm.txt 2021-02-04 17:33:02 +00:00
Anthony Calosa
96a2ccc3a5 [Mobile] Sound/Music Adjustment 2021-02-05 01:32:00 +08:00
Anthony Calosa
3fb0f28dde Merge branch 'master' into 'master' 
Update SoundEffect

See merge request core-developers/forge!3743
 2021-02-04 17:28:05 +00:00
Anthony Calosa
3f66e67eea Update SoundEffect 
-replace wav to mp3
-converted the mp3 files to have smaller size
 2021-02-04 22:49:03 +08:00
Michael Kamensky
233bd2a1c8 Merge branch 'borealOutrider' into 'master' 
TriggerSpellAbilityCast: extra flag for spent Snow shares color with card

See merge request core-developers/forge!3740
 2021-02-04 14:36:33 +00:00
Hans Mackowiak
dee961c603 TriggerSpellAbilityCast: extra flag for spent Snow shares color with card 2021-02-04 15:06:26 +01:00
Michael Kamensky
78af85bacc Merge branch 'cantCastRework' into 'master' 
CantBeCast: rework StaticAbility for Void Winnower

See merge request core-developers/forge!3643
 2021-02-04 14:02:43 +00:00
Hans Mackowiak
2d9834e962 CantBeCast: rework StaticAbility for Void Winnower 2021-02-04 14:02:42 +00:00
Michael Kamensky
4244fb049d Merge branch 'foretellAIcleanup' into 'master' 
AI: cleanup for AI to play Foretell cards

See merge request core-developers/forge!3739
 2021-02-04 13:07:42 +00:00
Hans Mackowiak
a83fc18d92 AI: cleanup for AI to play Foretell cards 2021-02-04 13:07:41 +00:00
John
a3339ea19b Upload New File 2021-02-04 09:51:17 +00:00
Michael Kamensky
76a2899769 Merge branch 'draugr' into 'master' 
add MayPlaySnowIgnoreColor for Draugr Necromancer

See merge request core-developers/forge!3724
 2021-02-04 04:54:06 +00:00
Michael Kamensky
6a0cce3628 Merge branch 'twosat-master-patch-12664' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3735
 2021-02-04 04:53:12 +00:00
Hans Mackowiak
03f7723860 Merge branch 'Williams-master-patch-48393' into 'master' 
KHM fixes

See merge request core-developers/forge!3734
 2021-02-04 01:34:34 +00:00
John
114df41b1c KHM fixes 2021-02-04 01:34:33 +00:00
Hans Mackowiak
dcfecf3d05 Merge branch 'various' into 'master' 
Various KHM fixes

See merge request core-developers/forge!3737
 2021-02-04 01:34:08 +00:00
Tim Mocny
474ab885cb Various KHM fixes 2021-02-04 01:34:07 +00:00
Tim Mocny
2ddb8f91c0 Merge branch 'thenobletheif-master-patch-50367' into 'master' 
Added thenobletheif (myself) to the list of contributors for work on the...

See merge request core-developers/forge!3736
 2021-02-03 20:26:44 +00:00
Viktor Azorius
6ba73bf3f4 Added thenobletheif (myself) to the list of contributors for work on the eldraine planar conquest decks. 2021-02-03 19:40:23 +00:00
Andreas Bendel
896e581744 Update de-DE.properties 
a few new subgame lines
 2021-02-03 19:24:29 +00:00
Michael Kamensky
c8156d061e Merge branch 'Williams-master-patch-33401' into 'master' 
KHM Contributions 3 Feb

See merge request core-developers/forge!3732
 2021-02-03 17:03:47 +00:00
Michael Kamensky
d1a54c9885 Merge branch 'triggerActivationLimitGen' into 'master' 
Trigger: make ActivationLimit work for all trigger

See merge request core-developers/forge!3730
 2021-02-03 17:03:43 +00:00
Anthony Calosa
502e787e7c Merge branch 'master' into 'master' 
[Mobile] fix homescreen interaction

See merge request core-developers/forge!3733
 2021-02-03 17:01:52 +00:00
Anthony Calosa
730c4fce32 [Mobile] fix homescreen interaction 2021-02-04 00:57:04 +08:00
John
267966689b Update koll_the_forgemaster.txt 2021-02-03 16:04:22 +00:00
John
68e3de69d6 Update cosmos_elixir.txt 2021-02-03 16:03:36 +00:00